]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d4001f 8558640)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 24 Mar 2014 09:30:05 +0000 (10:30 +0100)
committerAnatol Belski <ab@php.net>
Mon, 24 Mar 2014 09:30:05 +0000 (10:30 +0100)
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore

1  2 
win32/build/confutils.js patch | diff1 | diff2 | blob | history

diff --cc win32/build/confutils.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.