com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/ var_unserializer.c
| From: | Xinchen Hui | Date: | Sat, 09 Mar 2013 15:10:48 +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-71426@lists.php.net to get a copy of this message | ||
Commit: 1be745ce1bad3875aa2b1fc7abeefda22f372f19
Author: Xinchen Hui <laruence@php.net> Sat, 9 Mar 2013 23:10:48 +0800
Parents: af5ada3871d110add52f5a5df8c601d994b9345b 7197f0ffccea7f195bc28571e30c389eadda874b
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1be745ce1bad3875aa2b1fc7abeefda22f372f19
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 3730ff8,d8bae08..ddf43b0
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 on Mon Jan 21 11:41:53 2013 */
-/* Generated by re2c 0.13.5 on Sat Mar 9 22:33:09 2013 */
++/* Generated by re2c 0.13.5 */
#line 1 "ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+