com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/ var_unserializer.c
| From: | Xinchen Hui | Date: | Mon, 21 Jan 2013 03:42:16 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/ var_unserializer.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71027@lists.php.net to get a copy of this message | ||
Commit: 85fae636d09a08b53ffd7244cc6e8ec4d4cdab7c
Author: Xinchen Hui <laruence@php.net> Mon, 21 Jan 2013 11:42:16 +0800
Parents: f7b99c481d0a943d922e99ad9afa82c45193030e 86c1a26169ce44c9ea48e424b62128ee62f31d59
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=85fae636d09a08b53ffd7244cc6e8ec4d4cdab7c
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/standard/var_unserializer.c
Changed paths:
MM ext/standard/var_unserializer.c
Diff:
diff --cc ext/standard/var_unserializer.c
index 857b2d4,bd0b2f6..3730ff8
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 */
-/* Generated by re2c 0.13.5 on Mon Jan 21 11:34:03 2013 */
++/* Generated by re2c 0.13.5 on Mon Jan 21 11:41:53 2013 */
#line 1 "ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+