Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #69689 (Align PCRE_MINOR with current version)
This commit is contained in:
Lior Kaplan 2015-06-18 17:34:53 +03:00
commit ca33ae3eb2

View File

@ -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