]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorFelipe Pena <felipensp@gmail.com>
Sun, 29 Apr 2012 22:36:10 +0000 (19:36 -0300)
committerFelipe Pena <felipensp@gmail.com>
Sun, 29 Apr 2012 22:36:10 +0000 (19:36 -0300)
commitbbe9eec9a2c385f096f4200e0f70d0aea88117b8
tree4ab8e3f7b0dd473c34f872644e2a77ed147cce8b
parent7fa45a9399922f324a4fe7e4af8d6f40b0592172
parentcc5b995c78038b92317b38356c9009ff80850d8b
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net
Zend/zend_language_scanner.l