]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:35:23 +0000 (22:35 +0200)
committerAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:35:23 +0000 (22:35 +0200)
commit63abaa6d69236c4abf06a00fbc64908e29b7ab81
tree7485dd088e728ca29ae4ae234c11974acdc72eb2
parentfbc21af87b752b99f6b78503cadc89dbba6c98f1
parentefcc789ef860742ca59db3723b3fad0e519d6461
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix end of stream exception when generating makefile
win32/build/confutils.js