]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorkrakjoe <joe.watkins@live.co.uk>
Sun, 22 Dec 2013 13:15:40 +0000 (13:15 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Sun, 22 Dec 2013 13:15:40 +0000 (13:15 +0000)
commit621862a1927592e68c4b6b69f56bf145cc851e86
treeb79d3081bcf0c45c775be015978362d7a0a3ba39
parente700cbff22bac6df9585edef7fa6fd70abc69f76
parent2a1b60569fda7b9ca949f557c617d2555014e9fd
Merge branch 'PHP-5.6'

* PHP-5.6:
  stop warnings from unused opcode map
  - BFN

Conflicts:
NEWS
Zend/zend_vm_opcodes.h
NEWS
Zend/zend_vm_opcodes.c
Zend/zend_vm_opcodes.h