]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c6fb62 d3ca974)
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 21 Aug 2014 07:09:47 +0000 (09:09 +0200)
committerAnatol Belski <ab@php.net>
Thu, 21 Aug 2014 07:09:47 +0000 (09:09 +0200)
* PHP-5.6:
  avoid clash when stdint.h was included after win32/php_stdint.h


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