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

..

Amplifier.cpp

Merge stable-1.1

2014-11-10 19:26:59 +01:00

Amplifier.h

Merge stable-1.1

2014-11-10 19:26:59 +01:00

AmplifierControlDialog.cpp

Merge branch 'master' into rename

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

AmplifierControlDialog.h

Add missing Q_OBJECT macros in header files

2014-11-21 06:46:47 +01:00

AmplifierControls.cpp

Rename engine to Engine

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

AmplifierControls.h

Rename a lot…

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

artwork.png

Amplifier

2014-03-15 21:14:55 +02:00

CMakeLists.txt

Fix moc_file inclusion in cmake files

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

logo.png

Amplifier

2014-03-15 21:14:55 +02:00