8 commits

Author	SHA1	Message	Date
Xinchen Hui	73c1be2653	Bump year	2015-01-15 23:26:03 +08:00
Xinchen Hui	47c9027772	Bump year	2014-01-03 11:06:16 +08:00
krakjoe	247ec0d81f	Merge branch 'PHP-5.4' into PHP-5.5 ... * PHP-5.4: stop warnings from unused opcode map - BFN	2013-12-22 13:07:41 +00:00
krakjoe	b1df00a7c9	stop warnings from unused opcode map	2013-12-22 13:00:51 +00:00
Bob Weinand	7e3af096b3	Merge branch 'PHP-5.4' into PHP-5.5 ... Conflicts: Zend/zend_vm_opcodes.c	2013-12-22 00:54:59 +01:00
Bob Weinand	97bf254385	Included new .c file in build too	2013-12-22 00:52:05 +01:00
Bob Weinand	0dd2765687	Merge branch 'PHP-5.4' into PHP-5.5 ... Conflicts: Zend/zend_vm_opcodes.h	2013-12-21 23:49:28 +01:00
Bob Weinand	61199be02f	Moved to new file, killing a lot of warnings	2013-12-21 23:45:34 +01:00