[kmplayer/f13/master: 6/6] Merge branch 'master' into f13
Orcan Ogetbil
oget at fedoraproject.org
Tue Oct 5 22:20:24 UTC 2010
commit 2ce0ed6733b9aa3ecf711cf320980906217b319a
Merge: ae29dfa 41379d2
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Tue Oct 5 18:20:20 2010 -0400
Merge branch 'master' into f13
Conflicts:
.gitignore
kmplayer-no-xtest.patch
kmplayer.spec
sources
.gitignore | 2 +-
kmplayer-no-xtest.patch | 10 ----------
kmplayer.spec | 5 ++++-
sources | 2 +-
4 files changed, 6 insertions(+), 13 deletions(-)
---
diff --cc .gitignore
index a05f1a0,255b6a6..636bd2a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--kmplayer-0.11.2b.tar.bz2
+ /kmplayer-0.11.2c.tar.bz2
More information about the scm-commits
mailing list