com php-src: Merge branch 'PHP-5.4': ext/mysqlnd/mysqlnd.h
| From: | David Soria Parra | Date: | Tue, 20 Mar 2012 16:59:33 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4': ext/mysqlnd/mysqlnd.h | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-68074@lists.php.net to get a copy of this message | ||
Commit: 6e7284fb5be77bcbb26ea1934350e902b195a1c1
Author: David Soria Parra <dsp@php.net> Tue, 20 Mar 2012 17:59:33 +0100
Parents: 1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cd c918ca57a7233206ec78ac00438eeb6830e3680b
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6e7284fb5be77bcbb26ea1934350e902b195a1c1
Log:
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
Changed paths:
MM ext/mysqlnd/mysqlnd.h
Diff:
6e7284fb5be77bcbb26ea1934350e902b195a1c1
diff --combined ext/mysqlnd/mysqlnd.h
index 43aee62,b0b3b15..c32ac72
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@@ -22,7 -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 - 20111026 - $Id$"
++#define MYSQLND_VERSION "mysqlnd 5.0.10-dev - 20111026 - $Id$"
#define MYSQLND_VERSION_ID 50010
#define MYSQLND_PLUGIN_API_VERSION 1