[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_API.h

[Sara Golemon]

Commit:4f46a40b9df80ef3faf498262c7a06a77ee98041
Author:Sara Golemon poll...@php.net Sun, 19 May 2013 13:35:03 
-0700
Parents:   4840ff0f05876ee614d17804d2340f2233eb4111 
2d7415a4af66e0771b36a10534e304fe7af4a855
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Don't double-quote name of namespaced function.

Changed paths:
  MM  Zend/zend_API.h


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: Zend/zend_API.h ext/spl/spl_fixedarray.c

[Nikita Popov]

Commit:30270af777fce6d4dbfbaafb37a431ae9f0bfc17
Author:Nikita Popov ni...@php.net Wed, 30 Jan 2013 20:34:01 +0100
Parents:   d86e14b8f6bc7213d597cc6beb94a573fefb6889 
bb4d11b405ae1f37a8b0e4db630e80c5678f0746
Branches:  master

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

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

Conflicts:
configure.in
main/php_version.h

Changed paths:
  MM  Zend/zend_API.h
  MM  ext/spl/spl_fixedarray.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: Zend/zend_API.h

[Johannes Schlüter]

Commit:78d3e66f3ae4230cee0c28722284948201e001d8
Author:Johannes Schlüter johan...@php.net Tue, 29 Jan 2013 
19:50:14 +0100
Parents:   078b025a15a22c290f36e66b0c3336376623266e 
1433854681d8cd37803873b2f891a8d60d77cc3c
Branches:  PHP-5.5 master

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

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

Changed paths:
  MM  Zend/zend_API.h


Diff:



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