[clamtk/f12/master] Update to 4.29

davem davem at fedoraproject.org
Sat Sep 11 12:37:57 UTC 2010


commit 4e63ff761d77389ee222ed98261f46dc0f8dfaf7
Author: Dave M <dave.nerd at gmail.com>
Date:   Sat Sep 11 07:33:24 2010 -0500

    Update to 4.29

 .gitignore.BACKUP.14252.gitignore |    9 +++++++++
 .gitignore.BASE.14252.gitignore   |    2 ++
 .gitignore.LOCAL.14252.gitignore  |    5 +++++
 .gitignore.REMOTE.14252.gitignore |    3 +++
 4 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore.BACKUP.14252.gitignore b/.gitignore.BACKUP.14252.gitignore
new file mode 100644
index 0000000..291029a
--- /dev/null
+++ b/.gitignore.BACKUP.14252.gitignore
@@ -0,0 +1,9 @@
+clamtk-4.27.tar.gz
+<<<<<<< HEAD
+=======
+clamtk-4.28.tar.gz
+<<<<<<< HEAD
+>>>>>>> master
+=======
+/clamtk-4.29.tar.gz
+>>>>>>> master
diff --git a/.gitignore.BASE.14252.gitignore b/.gitignore.BASE.14252.gitignore
new file mode 100644
index 0000000..e31855d
--- /dev/null
+++ b/.gitignore.BASE.14252.gitignore
@@ -0,0 +1,2 @@
+clamtk-4.27.tar.gz
+clamtk-4.28.tar.gz
diff --git a/.gitignore.LOCAL.14252.gitignore b/.gitignore.LOCAL.14252.gitignore
new file mode 100644
index 0000000..71044bc
--- /dev/null
+++ b/.gitignore.LOCAL.14252.gitignore
@@ -0,0 +1,5 @@
+clamtk-4.27.tar.gz
+<<<<<<< HEAD
+=======
+clamtk-4.28.tar.gz
+>>>>>>> master
diff --git a/.gitignore.REMOTE.14252.gitignore b/.gitignore.REMOTE.14252.gitignore
new file mode 100644
index 0000000..e45b5cb
--- /dev/null
+++ b/.gitignore.REMOTE.14252.gitignore
@@ -0,0 +1,3 @@
+clamtk-4.27.tar.gz
+clamtk-4.28.tar.gz
+/clamtk-4.29.tar.gz


More information about the scm-commits mailing list