[soundconverter/f14: 7/7] Merge branch 'master' into f14
Michael Schwendt
mschwendt at fedoraproject.org
Sun Oct 9 18:27:30 UTC 2011
commit 902dcb94bcb7fb6954fdcf4192efb583ccd2073a
Merge: 43fa254 8b6e77b
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Sun Oct 9 20:27:18 2011 +0200
Merge branch 'master' into f14
Conflicts:
soundconverter.spec
soundconverter-1.5.4-clearlist.patch | 11 ++++
soundconverter-1.5.4-flacogg.patch | 90 ++++++++++++++++++++++++++++
soundconverter-1.5.4-gst-profile-bad.patch | 18 ++++++
soundconverter.spec | 44 +++++++++++---
4 files changed, 155 insertions(+), 8 deletions(-)
---
More information about the scm-commits
mailing list