diff options
| author | Sara Golemon <pollita@php.net> | 2014-08-19 13:17:56 -0700 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2014-08-19 13:17:56 -0700 |
| commit | ac4569621dc8762862dca6d39adf4ceb39e7e00b (patch) | |
| tree | 80156e551ecaa966410095321693a9913e56259d /win32/php_stdint.h | |
| parent | b278be894fcd0f2cbaee93e3f657f7f9beeb532f (diff) | |
| parent | cbe1597b747474388912c91018b0e12275784720 (diff) | |
| download | php-git-ac4569621dc8762862dca6d39adf4ceb39e7e00b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Switch use of strtok() to gd_strtok_r()
Conflicts:
NEWS
Diffstat (limited to 'win32/php_stdint.h')
0 files changed, 0 insertions, 0 deletions