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
..
2014-05-29 22:48:13 +03:00
2014-05-26 03:25:15 +03:00
2014-05-26 03:25:15 +03:00
2014-11-10 19:26:59 +01:00
2014-11-04 22:56:50 +01:00
2014-05-26 03:25:15 +03:00
2014-05-26 03:25:15 +03:00
2014-05-26 03:25:15 +03:00
2014-05-26 03:25:15 +03:00
2014-05-26 03:25:15 +03:00
2014-05-26 03:25:15 +03:00
2014-05-26 03:25:15 +03:00