Stanislav Malyshev c793a65690 Merge branch 'PHP-5.4' into PHP-5.5 ...

* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c

2013-08-04 16:06:24 -07:00

..

basic

typo fixes

2013-07-15 00:23:03 -07:00

classes

Merge branch 'PHP-5.4' into PHP-5.5

2013-08-04 16:06:24 -07:00

func

Added XOR support for expressions in INI parser

2013-03-27 21:28:53 +01:00

lang

Merge branch 'PHP-5.4' into PHP-5.5

2012-12-05 09:58:04 +01:00

output

Merge branch 'PHP-5.4' into PHP-5.5

2013-06-13 10:30:18 -07:00

run-test

Fix tests (patch by Lars)

2008-07-21 12:23:38 +00:00

security

Merge branch 'PHP-5.3' into PHP-5.4

2012-11-15 12:29:38 +01:00

strings

Merge branch 'PHP-5.3' into PHP-5.4

2012-10-10 10:31:31 +08:00

quicktester.inc

- Fixed the bz2 tests. (and changed the usage comment to be correct)

2002-03-20 02:16:34 +00:00