Skip to content

Commit

Permalink
Merge branch 'PHP-5.3' into PHP-5.4
Browse files Browse the repository at this point in the history 
* PHP-5.3:
  Regenerate Zend ini scanner

Conflicts:
	Zend/zend_ini_scanner.c
	Zend/zend_ini_scanner_defs.h
  • Loading branch information
@adoy
adoy committed Nov 16, 2012
2 parents 15ab75b + c886691 commit 99edb55
Show file tree
Hide file tree
Showing 2 changed files with 1,335 additions and 1,349 deletions.
Loading

0 comments on commit 99edb55

Please sign in to comment.