]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 605b3c2 757f4a9)
Merge branch 'PHP-5.5'
authorMichael Wallner <mike@php.net>
Mon, 21 Oct 2013 20:16:21 +0000 (22:16 +0200)
committerMichael Wallner <mike@php.net>
Mon, 21 Oct 2013 20:16:21 +0000 (22:16 +0200)
commitcfd911473bb6b6a34dffbd7b12b1d97278683264
treeea33ce314ec2fc81eaeb1ca88704ecc128a334d3tree | snapshot
parent605b3c2ca1b8d29125f49a14b08f848368fc3d17commit | diff
parent757f4a952ce77b7892b38e177fa78de8e2f54128commit | diff
Merge branch 'PHP-5.5'

* PHP-5.5:
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By:  Draal Conflicts:  configure.in  main/php_version.h
ext/exif/exif.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.