[ncmpcpp/f14: 5/5] Merge branch 'master' into f14
Dominic Hopf
dmaphy at fedoraproject.org
Sat Oct 15 00:11:07 UTC 2011
commit ae5db3d6ba7d4bf692f579b6cc557075f2942934
Merge: 2e60ec0 3307ed0
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date: Sat Oct 15 02:10:28 2011 +0200
Merge branch 'master' into f14
Conflicts:
.gitignore
ncmpcpp.spec
sources
.gitignore | 1 +
ncmpcpp.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
More information about the scm-commits
mailing list