[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/string.c

2013-03-20 Thread Xinchen Hui 
Commit:b29a9fa75d12c781495fdc271c5ed14901464898
Author:Xinchen Hui larue...@php.net Thu, 21 Mar 2013 11:14:36 
+0800
Parents:   da6916a770b7be6e029579a1d34302b5d2112ece 
0fd3572f4edbe7b3d9efdd212e214a9052dcfd01
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b29a9fa75d12c781495fdc271c5ed14901464898

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  ext/standard/string.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/string.c

2013-01-15 Thread Gustavo André dos Santos Lopes 
Commit:1ce5a225899c19b79c64451e830cd3940ee2bff3
Author:Gustavo Lopes gust...@icemobile.com Mon, 14 Jan 2013 
17:19:23 +0100
Parents:   be07f815f240803fe7a48a5fb3d68a169bef4707 
200242595dabfdaf6093da3e9ae6fef246ea8906
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1ce5a225899c19b79c64451e830cd3940ee2bff3

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS

Changed paths:
  MM  ext/standard/string.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/string.c

2013-01-15 Thread Anatoliy Belsky 
Commit:18e160411e364ee02eff12e8ab516be9911be393
Author:Anatoliy Belsky a...@php.net Tue, 15 Jan 2013 22:39:49 
+0100
Parents:   dba22c08640b02e68bfea68440246fec1fb7459d 
9498cf6194496a1dd6b400e3e9a85ff005dc3dcd
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=18e160411e364ee02eff12e8ab516be9911be393

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed build
  NEWS for bug #63893

Conflicts:
NEWS

Bugs:
https://bugs.php.net/63893

Changed paths:
  MM  ext/standard/string.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/string.c

2013-01-08 Thread Xinchen Hui 
Commit:6deb8361f32d14fffdd284b47b59cd5dd50baf80
Author:Xinchen Hui larue...@php.net Wed, 9 Jan 2013 10:57:47 +0800
Parents:   9566314d626770c16875476a4c5dce0e63a57441 
f3b1b8516906fe900e521216c8f01e362790af30
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6deb8361f32d14fffdd284b47b59cd5dd50baf80

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  ext/standard/string.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php