Files
lmms/plugins/MidiImport/MidiImport.cpp
Tobias Doerffel f2876ea650 Merge remote-tracking branch 'origin/stable-1.1'
Conflicts:
	data/locale/zh.ts
	src/tracks/Pattern.cpp
2014-09-30 22:53:24 +02:00

12 KiB