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

..

mallets

Merge branch 'master' into rename

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

CMakeLists.txt

migrated build-system to CMAKE

2008-07-22 11:36:50 +00:00