diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2015-06-18 17:35:54 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2015-06-18 17:35:54 +0300 |
| commit | 3930e1f2fa0be3626c9d34bfe34d02ca83106d6d (patch) | |
| tree | 0792d2d964e2d7bf1b35c5d28e44329124682099 | |
| parent | 811816dc25032867c3489abb8a9089a986aee185 (diff) | |
| parent | ca33ae3eb2e8e547ee3c7d2360700e225a17d81b (diff) | |
| download | php-git-3930e1f2fa0be3626c9d34bfe34d02ca83106d6d.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69689 (Align PCRE_MINOR with current version)
| -rw-r--r-- | ext/pcre/pcrelib/pcre.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pcre/pcrelib/pcre.h b/ext/pcre/pcrelib/pcre.h index 9216d55b0a..58ed46a2a3 100644 --- a/ext/pcre/pcrelib/pcre.h +++ b/ext/pcre/pcrelib/pcre.h @@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE. /* The current PCRE version information. */ #define PCRE_MAJOR 8 -#define PCRE_MINOR 36 +#define PCRE_MINOR 37 #define PCRE_PRERELEASE -#define PCRE_DATE 2014-09-26 +#define PCRE_DATE 2015-04-28 /* When an application links to a PCRE DLL in Windows, the symbols that are imported have to be identified as such. When building PCRE, the appropriate |