Commit Graph
2 Commits
Author SHA1 Message Date
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
Tobias Doerffel 0055fe13b1 MidiImport: fixed plugin folder name 2014-09-30 22:50:38 +02:00