]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorFelipe Pena <felipensp@gmail.com>
Mon, 30 Apr 2012 18:56:15 +0000 (15:56 -0300)
committerFelipe Pena <felipensp@gmail.com>
Mon, 30 Apr 2012 18:56:15 +0000 (15:56 -0300)
* PHP-5.4:
  - Fixed Windows build

1  2 
Zend/zend_language_scanner.l

Simple merge