[petit/f13/master: 5/5] Merge branch 'master' into f13

Sandro Mathys red at fedoraproject.org
Wed Oct 20 14:54:04 UTC 2010


commit b37579d2ea49c1dc7bd036640ebc4bfdc182b15e
Merge: a0d4aaf 2996465
Author: Sandro Mathys <red at fedoraproject.org>
Date:   Wed Oct 20 16:53:44 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	petit.spec
    	sources

 .gitignore |    1 +
 petit.spec |    9 ++++++---
 sources    |    1 +
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --cc petit.spec
index f462308,ffa366f..6503eda
--- a/petit.spec
+++ b/petit.spec
@@@ -68,5 -68,11 +68,8 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Wed Oct 20 2010 Sandro Mathys <red at fedoraproject.org> - 1.0.3-1
+ - new upstream version
+ 
 -* Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 1.0.0-2
 -- recompiling .py files against Python 2.7 (rhbz#623345)
 -
  * Sun Mar 07 2010 Sandro Mathys <red at fedoraproject.org> - 1.0.0-1
  - initial package


More information about the scm-commits mailing list