[amarok/f12/master: 47/47] Merge branch 'master' into f12
Rex Dieter
rdieter at fedoraproject.org
Thu Sep 16 19:13:31 UTC 2010
commit 7f9fda66094689f9f1033ef140eb9dbc61cf1227
Merge: 00f4cf1 a0dc2f7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Sep 16 14:18:36 2010 -0500
Merge branch 'master' into f12
Conflicts:
.gitignore
amarok.spec
sources
.gitignore | 2 +-
0001-Move-some-code-in-TrayIcon-class.patch | 85 -------
0002-Some-TrayIcon-changes.patch | 251 -------------------
...-not-update-cover-each-time-we-update-the.patch | 258 --------------------
...e-redundant-debug-output.-Update-copyrigh.patch | 52 ----
amarok-2.3.1-glib26_signals_fix.patch | 14 -
amarok.spec | 38 ++--
sources | 2 +-
8 files changed, 25 insertions(+), 677 deletions(-)
---
More information about the scm-commits
mailing list