]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70e51db 0a331f4)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 17 Feb 2015 06:47:57 +0000 (07:47 +0100)
committerStanislav Malyshev <stas@php.net>
Tue, 17 Feb 2015 06:47:57 +0000 (07:47 +0100)
* PHP-5.6:
  fix TS build

Conflicts:
ext/date/php_date.c


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