[clementine/f12/master: 9/9] Merge branch 'master' into f12
Orcan Ogetbil
oget at fedoraproject.org
Wed Sep 29 22:33:39 UTC 2010
commit b8d6eafaac233e7c5db9fee4c4e69fa4f8e912e8
Merge: 6c5f087 9bfeed7
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Wed Sep 29 18:33:32 2010 -0400
Merge branch 'master' into f12
Conflicts:
.gitignore
clementine.spec
sources
.gitignore | 3 +--
clementine.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 4f68349,1540219..9c510ac
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--clementine-0.4.2.tar.gz
--/clementine-0.5.2.tar.gz
-/clementine-0.5.3.tar.gz
++clementine-0.5.3.tar.gz
More information about the scm-commits
mailing list