]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 44697c1 00a7b1f)
Merge branch 'PHP-5.5' into PHP-5.6
authorSara Golemon <pollita@php.net>
Wed, 4 Dec 2013 02:21:12 +0000 (18:21 -0800)
committerSara Golemon <pollita@php.net>
Wed, 4 Dec 2013 02:21:12 +0000 (18:21 -0800)
commitdf755deb451aa2787a8663fc78643de7642ace08
tree2b1f1c863e4bc689d70e27ea9d8cdc0a8cb2a214tree | snapshot
parent44697c115b3098db677e42e78c11a0cc9e0e0019commit | diff
parent00a7b1ff7fed49df51d0392d47aa79f63bf1c66ecommit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix php_module_startup() when loading more than one additional module
main/main.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.