granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 83d45d0 149568f)

author	Dmitry Stogov <dmitry@zend.com>
	Mon, 5 May 2014 09:02:43 +0000 (13:02 +0400)
committer	Dmitry Stogov <dmitry@zend.com>
	Mon, 5 May 2014 09:02:43 +0000 (13:02 +0400)
commit	cd4b4dfc4d661c0bb6f8bffc4c7d285194904e28
tree	dfcce3d9dbf2a12e10ada6edf2f66dc801cd0fc5	tree \| snapshot
parent	83d45d0a04e3cca8282911c8a384a73297f7375f	commit \| diff
parent	149568f4da75a148d6ca71073b353f0d5f8f477a	commit \| diff

Merge branch 'master' into refactoring2

Conflicts:
Zend/zend_hash.c
ext/date/php_date.c

Zend/zend.c	diff1 \|	diff2 \|	blob \| history
ext/curl/interface.c	diff1 \|	diff2 \|	blob \| history
ext/date/php_date.c	diff1 \|	diff2 \|	blob \| history
ext/mysqli/mysqli_nonapi.c	diff1 \|	diff2 \|	blob \| history
ext/pdo_firebird/firebird_driver.c	diff1 \|	diff2 \|	blob \| history
ext/standard/html.c	diff1 \|	diff2 \|	blob \| history

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