]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1fdca82 28fa31d)
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Mon, 10 Mar 2014 11:10:57 +0000 (12:10 +0100)
committerPierre Joye <pierre.php@gmail.com>
Mon, 10 Mar 2014 11:10:57 +0000 (12:10 +0100)
* PHP-5.4:
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)

Conflicts:
win32/build/confutils.js


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.