[gwenview/f18: 10/10] Merge branch 'master' into f18
Than Ngo
than at fedoraproject.org
Mon Mar 4 13:55:57 UTC 2013
commit 7d3d4d9362f62f1f8c8e681729c8f6dd07b845c3
Merge: 962bcb0 b1e2160
Author: Than Ngo <than at redhat.com>
Date: Mon Mar 4 14:55:37 2013 +0100
Merge branch 'master' into f18
Conflicts:
.gitignore
gwenview.spec
sources
.gitignore | 1 +
gwenview.spec | 33 +++++++++++++++++++++++++--------
sources | 2 +-
3 files changed, 27 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index a71faf0,f2d888d..7f9eec3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
+/gwenview-4.8.5.tar.xz
+/gwenview-4.9.1.tar.xz
+/gwenview-4.9.2.tar.xz
+/gwenview-4.9.3.tar.xz
+/gwenview-4.9.4.tar.xz
+/gwenview-4.9.5.tar.xz
+ /gwenview-4.10.1.tar.xz
More information about the scm-commits
mailing list