1
0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-18 20:40:43 +01:00
Clementine-audio-player-Mac.../ext/clementine-spotifyblob
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
..
CMakeLists.txt Build spotify blob as c++11 2014-02-06 18:06:25 +01:00
main.cpp Reformat all non-3rd-party C/C++/Objective-C++. 2014-02-07 16:34:20 +01:00
mediapipeline.cpp Merge branch 'master' into gstreamer-1.2 2014-06-09 16:20:24 +10:00
mediapipeline.h Reformat all non-3rd-party C/C++/Objective-C++. 2014-02-07 16:34:20 +01:00
spotify_utilities.cpp Reformat all non-3rd-party C/C++/Objective-C++. 2014-02-07 16:34:20 +01:00
spotify_utilities.h Reformat all non-3rd-party C/C++/Objective-C++. 2014-02-07 16:34:20 +01:00
spotify_utilities.mm Reformat all non-3rd-party C/C++/Objective-C++. 2014-02-07 16:34:20 +01:00
spotifyclient.cpp Add arraysize macro from Chromium 2014-04-29 14:11:52 +02:00
spotifyclient.h Use nullptr as parent parameter default everywhere 2014-02-10 16:03:54 +01:00
spotifykey.h Reformat all non-3rd-party C/C++/Objective-C++. 2014-02-07 16:34:20 +01:00