[clamtk/f15: 4/4] Update to 4.33

davem davem at fedoraproject.org
Sat Jun 11 13:15:16 UTC 2011


commit fc62aa271371837ad4d50dbb772420cf0492c681
Merge: c9ec067 54dea54
Author: Dave M <dave.nerd at gmail.com>
Date:   Sat Jun 11 08:14:56 2011 -0500

    Update to 4.33

 .gitignore  |    4 ++++
 clamtk.spec |    8 +++++++-
 sources     |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 92324c4,7e7afe1..9da5a99
--- a/.gitignore
+++ b/.gitignore
@@@ -4,3 -4,4 +4,7 @@@ clamtk-4.28.tar.g
  /clamtk-4.30.tar.gz
  /clamtk-4.31.tar.gz
  /clamtk-4.32.tar.gz
++<<<<<<< HEAD
++=======
+ /clamtk-4.33.tar.gz
++>>>>>>> master


More information about the scm-commits mailing list