Merge branch 'master' into f18

Conflicts: .gitignore nginx.spec sources
2012-12-11 17:55:25 +00:00 · 2012-12-11 17:55:25 +00:00 · 735b120360
parent 044f0c963b 7137e03771
commit 735b120360
3 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,3 +11,4 @@ x86_64/
 /nginx-1.2.3.tar.gz
 /nginx-1.2.4.tar.gz
 /nginx-1.2.5.tar.gz
+/nginx-1.2.6.tar.gz
--- a/nginx.spec
+++ b/nginx.spec
@ -10,7 +10,7 @@

 Name:              nginx
 Epoch:             1
-Version:           1.2.5
+Version:           1.2.6
 Release:           1%{?dist}

 Summary:           A high performance web server and reverse proxy server
@ -202,6 +202,9 @@ fi


 %changelog
+* Tue Dec 11 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-1
+- update to upstream release 1.2.6
+
 * Sat Nov 17 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.5-1
 - update to upstream release 1.2.5

--- a/2
+++ b/2
@ -1 +1 @@
-4f5a55187a3d45fa37d99d07ddd90800  nginx-1.2.5.tar.gz
+1350d26eb9b66364d9143fb3c4366ab6  nginx-1.2.6.tar.gz