]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorAnatoliy Belsky <ab@php.net>
Wed, 6 Feb 2013 15:23:16 +0000 (16:23 +0100)
committerAnatoliy Belsky <ab@php.net>
Wed, 6 Feb 2013 15:23:16 +0000 (16:23 +0100)
commit2249881c0dd769321757a91f026cf12114eb4b06
tree9ebe08b5efdbce57b066ddb51f54808bc803af87
parent9f7b121da318c8f9a10b577316fee6da190ae4d5
parent215da6057f5fe1545805fb5ab9299b78d3a3b259
Merge branch 'PHP-5.5'

* PHP-5.5:
  make libvpx optional
ext/gd/config.w32