summaryrefslogtreecommitdiff
path: root/Zend/zend_vm_opcodes.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6krakjoe2013-12-221-1/+2
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Bob Weinand2013-12-221-0/+2
| |\
| * | Merge branch 'PHP-5.5' into PHP-5.6Bob Weinand2013-12-211-1/+2
* | | Merge branch 'PHP-5.4' into PHP-5.5krakjoe2013-12-221-0/+5
|\ \ \ | |_|/ |/| |
| * | stop warnings from unused opcode mapkrakjoe2013-12-221-0/+5
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2013-12-221-0/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Included new .c file in build tooBob Weinand2013-12-221-0/+2
* | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2013-12-211-1/+6
|/
* Moved to new file, killing a lot of warningsBob Weinand2013-12-211-0/+181