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

1.6 KiB

Raw Blame History

View Raw