Lukas W 5f4cdac802 Merge branch 'master' into rename ...

Conflicts:
	src/core/Song.cpp
	src/gui/LfoControllerDialog.cpp
	src/tracks/InstrumentTrack.cpp

2014-11-26 11:45:55 +01:00

..

portsmf

…

CMakeLists.txt

…

MidiImport.cpp

…

MidiImport.h

…