Lukas W 8e8879f735 Merge stable-1.1 ...

Conflicts:
	include/ConfigManager.h
	include/MidiTime.h
	include/string_pair_drag.h
	src/gui/string_pair_drag.cpp
	src/gui/widgets/rubberband.cpp

2014-11-10 19:26:59 +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 stable-1.1

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

AmplifierControlDialog.h

Correct the program name and site in the descriptions.

2014-11-04 22:56:50 +01:00

AmplifierControls.cpp

Merge stable-1.1

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

AmplifierControls.h

Correct the program name and site in the descriptions.

2014-11-04 22:56:50 +01:00

artwork.png

Amplifier

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

CMakeLists.txt

Amplifier

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

logo.png

Amplifier

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