Author: mdounin
Date: 2012-02-05 19:03:21 +0000 (Sun, 05 Feb 2012)
New Revision: 4444

Log:
Merge of r4393: zlib license file include fixed.


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


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326-4327,4335-4336,4338-4343,4372-4375,4377,4379,4381-4385,4400,4403
+ /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326-4327,4335-4336,4338-4343,4372-4375,4377,4379,4381-4385,4393,4400,4403

Modified: branches/stable-1.0/misc/GNUmakefile
===================================================================
--- branches/stable-1.0/misc/GNUmakefile 2012-02-05 16:12:55 UTC (rev 4443)
+++ branches/stable-1.0/misc/GNUmakefile 2012-02-05 19:03:21 UTC (rev 4444)
@@ -112,7 +112,7 @@
cp -p $(OBJS)/lib/$(PCRE)/LICENCE \
$(TEMP)/$(NGINX)/docs/PCRE.LICENCE

- perl -ne 'print if /^ \(C\) 1995-2004/ .. /^ jloup\@gzip.org/' \
+ perl -ne 'print if /^ \(C\) 1995-20/ .. /^ jloup\@gzip.org/' \
$(OBJS)/lib/$(ZLIB)/README \
> $(TEMP)/$(NGINX)/docs/zlib.LICENSE


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel