diff options
| author | David Soria Parra <dsp@php.net> | 2012-03-20 17:59:33 +0100 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2012-03-20 17:59:33 +0100 |
| commit | 6e7284fb5be77bcbb26ea1934350e902b195a1c1 (patch) | |
| tree | 4624767035f413021118c7cd0d3fcec58a0e6365 /ext/mysqlnd/mysqlnd.h | |
| parent | 1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cd (diff) | |
| parent | c918ca57a7233206ec78ac00438eeb6830e3680b (diff) | |
| download | php-git-6e7284fb5be77bcbb26ea1934350e902b195a1c1.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
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/mysqlnd/mysqlnd.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index 43aee6246a..c32ac72193 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -22,7 +22,7 @@ #ifndef MYSQLND_H #define MYSQLND_H -#define MYSQLND_VERSION "mysqlnd 5.0.10-dev - 20111026 - $Revision$" +#define MYSQLND_VERSION "mysqlnd 5.0.10-dev - 20111026 - $Id$" #define MYSQLND_VERSION_ID 50010 #define MYSQLND_PLUGIN_API_VERSION 1 |