]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 118ed49 4c3b4dc)
Merge branch 'PHP-5.6'
authorMichael Wallner <mike@php.net>
Wed, 4 Feb 2015 08:50:14 +0000 (09:50 +0100)
committerMichael Wallner <mike@php.net>
Wed, 4 Feb 2015 08:50:14 +0000 (09:50 +0100)
commitafcaa52c738542245fa19d21e15e2c14c9c1dd17
treece00d5161196db4881ebd5c07b00959f24ebc8cdtree | snapshot
parent118ed493e1806d77e5e625f168653f2c349d3a10commit | diff
parent4c3b4dc74af13eec25ad460551df8fd4b3984269commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  make buildconf work as expected; autoconf really needs some help with all those external m4s

Conflicts:
build/build2.mk
build/build2.mk diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.