John Maguire 6fb4b8e97d Merge branch 'release-1.2' ...

Conflicts:
	cmake/Version.cmake
	ext/libclementine-common/core/closure.cpp
	ext/libclementine-common/core/closure.h
	ext/libclementine-common/core/concurrentrun.h
	ext/libclementine-remote/remotecontrolmessages.proto
	ext/libclementine-tagreader/tagreader.cpp
	src/core/deletefiles.cpp
	src/core/deletefiles.h
	src/core/mac_utilities.h
	src/core/mergedproxymodel.h
	src/core/musicstorage.h
	src/core/organise.cpp
	src/core/organise.h
	src/core/player.cpp
	src/core/songloader.cpp
	src/core/utilities.cpp
	src/devices/connecteddevice.h
	src/devices/devicekitlister.h
	src/devices/devicemanager.cpp
	src/devices/devicemanager.h
	src/devices/deviceproperties.cpp
	src/devices/deviceview.cpp
	src/devices/giolister.cpp
	src/devices/gpodloader.cpp
	src/devices/gpodloader.h
	src/devices/mtploader.cpp
	src/devices/mtploader.h
	src/engines/gstengine.cpp
	src/engines/gstengine.h
	src/engines/gstenginepipeline.cpp
	src/globalsearch/globalsearchview.cpp
	src/internet/groovesharkservice.cpp
	src/internet/magnatunedownloaddialog.cpp
	src/library/groupbydialog.h
	src/library/librarydirectorymodel.cpp
	src/library/librarymodel.cpp
	src/library/libraryview.cpp
	src/main.cpp
	src/networkremote/networkremote.cpp
	src/networkremote/networkremote.h
	src/networkremote/outgoingdatacreator.cpp
	src/networkremote/outgoingdatacreator.h
	src/playlist/playlist.cpp
	src/playlist/playlistbackend.cpp
	src/playlist/playlistbackend.h
	src/playlist/playlistdelegates.cpp
	src/playlist/playlistview.h
	src/playlistparsers/plsparser.cpp
	src/smartplaylists/generator.h
	src/smartplaylists/querywizardplugin.cpp
	src/smartplaylists/searchpreview.cpp
	src/songinfo/songinfoview.h
	src/transcoder/transcoder.cpp
	src/ui/albumcovermanagerlist.cpp
	src/ui/mainwindow.cpp
	src/ui/organisedialog.cpp
	src/visualisations/projectmvisualisation.cpp
	src/visualisations/projectmvisualisation.h
	src/widgets/nowplayingwidget.cpp
	src/widgets/nowplayingwidget.h
	src/widgets/osd.h
	src/widgets/osd_x11.cpp
	src/wiimotedev/shortcuts.cpp

2014-02-19 18:19:54 +01:00

..

Deb.cmake

Oops

2011-01-08 17:08:33 +00:00

FindFFTW3.cmake

Bundle the gstreamer moodbar plugin, with a patch that protects calls to fftwf_plan from multiple threads.

2012-05-27 17:30:58 +01:00

Format.cmake

Add "make format-diff" and "make format" commands that use clang-format to reformat source.

2014-02-12 01:20:49 +11:00

OptionalSource.cmake

Always run uic on optional ui files so we can get translations out. It was supposed to do this already...

2011-11-03 17:19:37 +00:00

ParseArguments.cmake

Make all the source files a single cmake target again.

2010-06-08 22:39:31 +00:00

Rpm.cmake

Use the sparkle version for the tarball and source directory, tell the rpm spec to use that instead of the default

2011-12-02 19:08:34 +00:00

SpotifyVersion.cmake

Support toplist browsing in spotify blob.

2012-06-12 15:34:23 +02:00

Summary.cmake

Print out the Clementine display version in the cmake summary.

2014-02-04 12:01:46 +01:00

Translations.cmake

Fix extraction of context messages from Qt ui files

2014-02-08 15:08:37 +01:00

Version.cmake

Merge branch 'release-1.2'

2014-02-19 18:19:54 +01:00