granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4837bdb 7687b8b)

author	Anatol Belski <ab@php.net>
	Tue, 19 Mar 2013 13:44:20 +0000 (14:44 +0100)
committer	Anatol Belski <ab@php.net>
	Tue, 19 Mar 2013 13:44:20 +0000 (14:44 +0100)
commit	6f0f5d5281f4311dc4254b917ba185bacb659add
tree	77a06e393edea9ae4cebaad0388bd31f0904d36b	tree \| snapshot
parent	4837bdb91049e47e0c15873a2d1d4d1f7a4c65d2	commit \| diff
parent	7687b8b81c599b0374cb902e9dd812d2cfc12efd	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix C90 compat

Zend/zend_API.c

Unnamed repository; edit this file 'description' to name the repository.