]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6267c40 e41059c)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 6 Feb 2014 08:17:29 +0000 (09:17 +0100)
committerAnatol Belski <ab@php.net>
Thu, 6 Feb 2014 08:17:29 +0000 (09:17 +0100)
* PHP-5.4:
  update libs_version.txt

Conflicts:
win32/build/libs_version.txt


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.