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
..
2012-05-27 17:30:58 +01:00
2012-05-27 21:51:18 +01:00
2014-06-09 16:20:24 +10:00
2014-06-05 14:08:22 +02:00
2014-01-25 00:24:31 +11:00
2012-05-27 21:51:18 +01:00
2012-05-27 17:30:58 +01:00
2012-05-27 21:51:18 +01:00