diff options
| author | Derick Rethans <github@derickrethans.nl> | 2012-10-18 17:53:55 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2012-10-18 17:53:55 +0100 |
| commit | b58d45b67fed9d5ee7bb4206b7613435b180543d (patch) | |
| tree | 00def54ed047e9036a1a443ae72d125395d5ea22 | |
| parent | 08a06597e69fce29de8ba2ab625dfd4242acd9ea (diff) | |
| parent | 7aed21c55753d2cfb5dc66e47b1a7396333e566f (diff) | |
| download | php-git-b58d45b67fed9d5ee7bb4206b7613435b180543d.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
Zend/acinclude.m4
| -rw-r--r-- | Zend/acinclude.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4 index a7358fa85d..136d2d8bef 100644 --- a/Zend/acinclude.m4 +++ b/Zend/acinclude.m4 @@ -4,7 +4,7 @@ dnl This file contains local autoconf functions. AC_DEFUN([LIBZEND_BISON_CHECK],[ # we only support certain bison versions - bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1" + bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2" # for standalone build of Zend Engine test -z "$SED" && SED=sed |