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-04-10 00:25:25 +03:00
2014-11-10 19:26:59 +01:00
2014-11-10 19:26:59 +01:00
2014-02-01 15:20:27 +01:00
2014-02-09 12:29:48 +02:00
2014-04-10 00:25:25 +03:00
2014-04-10 00:25:25 +03:00
2014-04-04 00:40:03 +03:00
2014-04-04 00:40:03 +03:00
2014-04-10 00:25:25 +03:00
2014-04-10 00:25:25 +03:00
2014-02-09 12:29:48 +02:00
2014-02-09 12:29:48 +02:00
2014-02-09 12:29:48 +02:00
2014-02-09 12:29:48 +02:00
2014-02-09 12:29:48 +02:00