[tito/el6/master: 7/7] Merge branch 'master' into el6

Devan Goodwin dgoodwin at fedoraproject.org
Wed Jan 5 18:55:10 UTC 2011


commit 99cb929fc9a2b1787b271cce6d6aea5e0bba45af
Merge: 77601d9 fcebfe9
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Wed Jan 5 14:54:39 2011 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	tito.spec

 .gitignore |    2 +-
 sources    |    2 +-
 tito.spec  |   41 +++++++++++++++++++++++++++++++++++++++--
 3 files changed, 41 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index b29fc59,14190d9..37d438d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--tito-0.2.0.tar.gz
+ /tito-0.3.0.tar.gz


More information about the scm-commits mailing list