diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-08-14 23:30:49 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-08-14 23:30:49 +0400 |
| commit | 7497c8793d928d2f025709d573150fb5e158ea9d (patch) | |
| tree | 3b4584a0ad11966b8d413f2d661c22a768f31323 /win32/php_stdint.h | |
| parent | 773d80c6df00b9bf6e9edd939c9b52d35395062e (diff) | |
| parent | 37e91cc5d34598b05bcd377f3115f36b43e786ac (diff) | |
| download | php-git-7497c8793d928d2f025709d573150fb5e158ea9d.tar.gz | |
Merge branch 'master' into phpng
* master: (51 commits)
Update Git rules
Back to -dev (with EOL notice in NEWS)
new NEWS block for the next release
It's 2014 already, fix copyright year where user visible
PHP 5.3.29
Some changes were lost in the merge commit of #66091
Updated NEWS for #66091
Fixed #66091
Updated NEWS for #66091
Updated NEWS for #66091
Fixed #66091
updated NEWS
updated NEWS
updated NEWS
backported the fix for bug #41577
NEWS entry for e6d93a1 / d73d44c
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Revert "Merge branch 'pull-request/694' into PHP-5.6"
PHP 5.3.29RC1
Fix missing type checks in various functions
...
Conflicts:
ext/date/php_date.c
ext/standard/math.c
Diffstat (limited to 'win32/php_stdint.h')
0 files changed, 0 insertions, 0 deletions