diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2013-12-22 00:54:59 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2013-12-22 00:54:59 +0100 |
| commit | 7e3af096b3fb383826fc7d656ceb043590a56e70 (patch) | |
| tree | 6da0699ff3b944c236c94ec8dde54260be255517 /Zend/Makefile.am | |
| parent | 00cc4dccb8aa710514e689fdafb922b5178e025f (diff) | |
| parent | 97bf25438526a2d4d60d4284bd12c1d40ae7134c (diff) | |
| download | php-git-7e3af096b3fb383826fc7d656ceb043590a56e70.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/zend_vm_opcodes.c
Diffstat (limited to 'Zend/Makefile.am')
| -rw-r--r-- | Zend/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/Makefile.am b/Zend/Makefile.am index 6417f3eb14..cea5c17fa2 100644 --- a/Zend/Makefile.am +++ b/Zend/Makefile.am @@ -10,7 +10,7 @@ libZend_la_SOURCES=\ zend_ini_parser.y zend_ini_scanner.l \ zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \ zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \ - zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \ + zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \ zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \ zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \ |