]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9924a08 4675b79)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 04:50:43 +0000 (20:50 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 04:50:43 +0000 (20:50 -0800)
* PHP-5.6:
  Conflicts:  ext/date/php_date.c

Conflicts:
ext/date/php_date.c


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