]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorunknown <pajoye@php.net>
Sat, 8 Sep 2012 16:47:32 +0000 (18:47 +0200)
committerunknown <pajoye@php.net>
Sat, 8 Sep 2012 16:47:32 +0000 (18:47 +0200)
* PHP-5.3:
  -enable VC11 (vc2012)

1  2 
win32/build/config.w32
win32/build/confutils.js

Simple merge
Simple merge