[nginx] svn commit: r4807 - in branches/stable-1.2: . misc

Mon Aug 6 17:38:12 UTC 2012

Author: mdounin
Date: 2012-08-06 17:38:12 +0000 (Mon, 06 Aug 2012)
New Revision: 4807
URL: http://trac.nginx.org/nginx/changeset/4807/nginx

Log:
Merge of r4775: updated PCRE used for win32 builds.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/misc/GNUmakefile

Index: branches/stable-1.2
===================================================================

--- branches/stable-1.2	2012-08-06 17:36:30 UTC (rev 4806)
+++ branches/stable-1.2	2012-08-06 17:38:12 UTC (rev 4807)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756-4771
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756-4771,4775
\ No newline at end of property
Modified: branches/stable-1.2/misc/GNUmakefile
===================================================================
--- branches/stable-1.2/misc/GNUmakefile	2012-08-06 17:36:30 UTC (rev 4806)
+++ branches/stable-1.2/misc/GNUmakefile	2012-08-06 17:38:12 UTC (rev 4807)
@@ -8,7 +8,7 @@
 OBJS =		objs.msvc8
 OPENSSL =	openssl-1.0.1c
 ZLIB =		zlib-1.2.5
-PCRE =		pcre-8.30
+PCRE =		pcre-8.31
 
 
 release:

