diff options
| author | David Soria Parra <dsp@php.net> | 2012-03-20 17:58:58 +0100 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2012-03-20 17:58:58 +0100 |
| commit | c918ca57a7233206ec78ac00438eeb6830e3680b (patch) | |
| tree | 6a0b5e4ea85c7a53a15231cfc7291837d9ea9c09 /ext/dba/libflatfile/flatfile.c | |
| parent | 71d894cd421d96517618e9d33dfea640499c8ffd (diff) | |
| parent | f7b10abae939412e8b5cab69cd579e071deb446b (diff) | |
| download | php-git-c918ca57a7233206ec78ac00438eeb6830e3680b.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
Diffstat (limited to 'ext/dba/libflatfile/flatfile.c')
| -rw-r--r-- | ext/dba/libflatfile/flatfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/dba/libflatfile/flatfile.c b/ext/dba/libflatfile/flatfile.c index e81b8ea1de..bf851847d5 100644 --- a/ext/dba/libflatfile/flatfile.c +++ b/ext/dba/libflatfile/flatfile.c @@ -306,7 +306,7 @@ datum flatfile_nextkey(flatfile *dba TSRMLS_DC) { /* {{{ flatfile_version */ char *flatfile_version() { - return "1.0, $Revision$"; + return "1.0, $Id$"; } /* }}} */ |