diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2015-06-18 17:34:53 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2015-06-18 17:34:53 +0300 |
| commit | ca33ae3eb2e8e547ee3c7d2360700e225a17d81b (patch) | |
| tree | a5df1279442c220ad3c296b2d2a0e7c3521179d9 | |
| parent | 991b2cc37be58501c34139ca650a3b5ba1804cce (diff) | |
| parent | cc7194dd10f9822d882d1cbd259d4208ccc82671 (diff) | |
| download | php-git-ca33ae3eb2e8e547ee3c7d2360700e225a17d81b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 |