[perl-Data-Types/el6: 9/9] Merge branch 'master' into el6

Ken Dreyer ktdreyer at fedoraproject.org
Fri Feb 8 03:19:12 UTC 2013


commit 5c1c0c6d49677ed7d498a6184420d6ed89e5d0d6
Merge: 271b361 0a8e7af
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date:   Thu Feb 7 20:18:06 2013 -0700

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	perl-Data-Types.spec
    	sources

 .gitignore           |    2 +-
 perl-Data-Types.spec |   49 +++++++++++++++++++++++++++++++++----------------
 sources              |    2 +-
 3 files changed, 35 insertions(+), 18 deletions(-)
---
diff --cc .gitignore
index f91b077,4476457..5368f8f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/Data-Types-0.08.tar.gz
+ /Data-Types-0.09.tar.gz


More information about the scm-commits mailing list