Xinchen Hui 110bf9c720 Merge remote-tracking branch 'origin/master' into phpng ...

Conflicts:
	Zend/zend_compile.h
	ext/openssl/xp_ssl.c

2014-07-18 16:25:43 +08:00

..

lib

Merge branch 'PHP-5.5' into PHP-5.6

2014-06-16 23:32:10 +03:00

tests

Merge branch 'master' into phpng

2014-06-18 17:50:27 +04:00

config0.m4

unify stdint type usage

2013-08-06 22:49:56 +02:00

config.w32

- fix header install

2010-12-14 13:10:25 +00:00

CREDITS

…

php_date.c

Merge remote-tracking branch 'origin/master' into phpng

2014-07-18 16:25:43 +08:00

php_date.h

Merge mainstream 'master' branch into refactoring

2014-04-26 00:32:51 +04:00

TODO

- Updated to-do.

2011-09-08 16:57:41 +00:00