Commit 99edb55

committed

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3: Regenerate Zend ini scanner Conflicts: Zend/zend_ini_scanner.c Zend/zend_ini_scanner_defs.h

2 parents 15ab75b + c886691 commit 99edb55Copy full SHA for 99edb55

2 files changed

+1335

-1349

lines changed

+1335

-1349

lines changed

Comments

(0)