Skip to content

Commit

Permalink
Merge branch 'PHP-5.4'
Browse files Browse the repository at this point in the history 
* PHP-5.4:
  - fix bug #61504, fix build errors on windows and possibly other

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
  • Loading branch information
@pierrejoye
pierrejoye committed Mar 28, 2012
2 parents 7894525 + c195596 commit 13bd9c2
Show file tree
Hide file tree
Showing 3 changed files with 7,432 additions and 7,797 deletions.
Loading

0 comments on commit 13bd9c2

Please sign in to comment.