6bb81328e8
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 |
||
---|---|---|
.. | ||
projectmpresetmodel.cpp | ||
projectmpresetmodel.h | ||
projectmvisualisation.cpp | ||
projectmvisualisation.h | ||
visualisationcontainer.cpp | ||
visualisationcontainer.h | ||
visualisationoverlay.cpp | ||
visualisationoverlay.h | ||
visualisationoverlay.ui | ||
visualisationselector.cpp | ||
visualisationselector.h | ||
visualisationselector.ui |