]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorSara Golemon <pollita@php.net>
Tue, 19 Aug 2014 20:24:49 +0000 (13:24 -0700)
committerSara Golemon <pollita@php.net>
Tue, 19 Aug 2014 20:24:49 +0000 (13:24 -0700)
commit1ec93f8069cbbcfcf825a433f4835830391801a6
treed78737594b2ca217385fa11b3f72ec33647761dd
parent14439b79b474317f4c5c90bbca551ec3a1a5c505
parenta309dda7771503b5972b5faec2f3234ed0637781
Merge branch 'PHP-5.6'

* PHP-5.6:
  Switch use of strtok() to gd_strtok_r()
NEWS
ext/gd/libgd/gdft.c