summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-08-21 09:09:47 +0200
committerAnatol Belski <ab@php.net>2014-08-21 09:09:47 +0200
commit333f093010a5c3d45d16f45d40b3515e4029bad0 (patch)
tree3e9757f1b9a8302ceaf09e3dcb8193272671fc76 /scripts
parent4c6fb627027b2a048bbcd47876eef1dfbddcc59a (diff)
parentd3ca974ff592d9f7789b6d6f5bb48a32b7d5eca7 (diff)
downloadphp-git-333f093010a5c3d45d16f45d40b3515e4029bad0.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: avoid clash when stdint.h was included after win32/php_stdint.h
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions