David Sansome 6bb81328e8 Merge branch 'master' into gstreamer-1.2 ...

Conflicts:
	ext/clementine-spotifyblob/mediapipeline.cpp
	gst/moodbar/gstfftwspectrum.c
	src/core/songloader.cpp
	src/core/songloader.h
	src/engines/gstengine.cpp
	src/engines/gstenginepipeline.cpp
	src/moodbar/moodbarpipeline.cpp
	src/musicbrainz/chromaprinter.cpp
	src/transcoder/transcoder.cpp
	src/ui/mainwindow.cpp
	src/visualisations/projectmvisualisation.cpp

2014-06-09 16:20:24 +10:00

..

clementine-spotifyblob

Merge branch 'master' into gstreamer-1.2

2014-06-09 16:20:24 +10:00

clementine-tagreader

Reformat all non-3rd-party C/C++/Objective-C++.

2014-02-07 16:34:20 +01:00

libclementine-common

Merge branch 'master' into gstreamer-1.2

2014-06-09 16:20:24 +10:00

libclementine-remote

Send filesize and file count in advance when client wants to download songs.

2014-05-10 14:53:38 +02:00

libclementine-spotifyblob

Use the full protobuf instead of protobuf-lite, to hopefully fix

2012-11-12 18:16:35 +11:00

libclementine-tagreader

use unique_ptr instead

2014-06-05 17:42:55 +02:00