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

DualFilter.cpp

Rename basicFilters/basic_filters.h

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

DualFilter.h

Rename basicFilters/basic_filters.h

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

DualFilterControlDialog.cpp

Merge branch 'master' into rename

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

DualFilterControlDialog.h

Add missing Q_OBJECT macros in header files

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

DualFilterControls.cpp

Rename basicFilters/basic_filters.h

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

DualFilterControls.h

Rename a lot…

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