Vesa ed11ccbf50 Fix conflict

2014-11-25 21:29:00 +02: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

Fix conflict

2014-11-25 21:29:00 +02:00

MidiImport.h

Merge branch 'stable-1.1'

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