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

..

artwork.png

…

CMakeLists.txt

Fix moc_file inclusion in cmake files

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

logo.png

…

peak_controller_effect_control_dialog.cpp

Rename a lot…

2014-11-26 10:09:49 +01:00

peak_controller_effect_control_dialog.h

Merge branch 'master' into rename

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

peak_controller_effect_controls.cpp

Rename engine to Engine

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

peak_controller_effect_controls.h

Rename a lot…

2014-11-26 10:09:49 +01:00

peak_controller_effect.cpp

Rename engine to Engine

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

peak_controller_effect.h

…