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

MidiImport: fixed plugin folder name

2014-09-30 22:50:38 +02:00

CMakeLists.txt

Fix moc_file inclusion in cmake files

2014-11-21 07:16:45 +01:00

MidiImport.cpp

Rename fixes

2014-11-26 01:46:12 +01:00

MidiImport.h

Merge branch 'stable-1.1'

2014-11-25 21:23:57 +02:00