]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 16 Jun 2013 22:29:25 +0000 (15:29 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 16 Jun 2013 22:29:25 +0000 (15:29 -0700)
commitac343d5c1f8de884921d8acddb2cc81227674615
tree8c84c0c0b5b2ec8279177b64a6dca6f35e885d52
parent3625b83aaa242c7c6aff045c03203a1b195bc310
parent2208447d428542960c73cfeceaf52e95ff0ca2d0
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #64936 - clean doc comment state at the beginning and end of the scan
  ws fix

Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_language_scanner_defs.h
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l