]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Wed, 28 Aug 2013 18:14:37 +0000 (11:14 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 28 Aug 2013 18:14:37 +0000 (11:14 -0700)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  removed the /Wp64 switch as we use true 64 bit compiler now
  updated lib versions
  updated lib versions, the vc11 ones only matter now


Trivial merge