[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [amarok/spotify] /: Merge branch 'spotify' of git://anongit.kde.org/amarok into spotify
From:       Bart Cerneels <bart.cerneels () kde ! org>
Date:       2012-11-07 21:49:52
Message-ID: 20121107214952.9FA22A60C4 () git ! kde ! org
[Download RAW message or body]

Git commit 475b41bd8816b728d9624a57659c5d2ed1ce350d by Bart Cerneels.
Committed on 07/11/2012 at 22:49.
Pushed by shanachie into branch 'spotify'.

Merge branch 'spotify' of git://anongit.kde.org/amarok into spotify

Conflicts:
	src/core-impl/collections/spotifycollection/SpotifySettingsDialog.cpp


http://commits.kde.org/amarok/475b41bd8816b728d9624a57659c5d2ed1ce350d
[prev in list] [next in list] [prev in thread] [next in thread]