Lukas W
23e0e0fb8e
Merge branch 'master' into ed_refac
Conflicts:
include/AutomationEditor.h
include/SongEditor.h
plugins/delay/delaycontrols.cpp
plugins/delay/delaycontrolsdialog.cpp
src/gui/editors/AutomationEditor.cpp
src/gui/editors/BBEditor.cpp
src/gui/editors/PianoRoll.cpp
2015-01-06 23:05:13 +01:00
..
2014-12-24 19:59:12 +02:00
2015-01-06 16:33:41 +01:00
2014-12-24 19:59:12 +02:00
2014-12-08 23:48:44 +00:00
2014-12-13 16:28:44 +02:00
2014-12-16 23:12:02 +02:00
2014-11-04 22:56:50 +01:00
2014-11-04 22:56:50 +01:00
2014-12-24 20:07:04 +02:00
2015-01-06 23:05:13 +01:00
2014-12-24 19:59:12 +02:00
2014-12-24 19:59:12 +02:00
2014-12-31 12:27:40 +00:00
2014-12-23 09:33:13 +00:00
2014-11-26 10:59:35 +01:00
2014-11-26 10:09:49 +01:00
2014-11-26 10:53:47 +01:00
2014-12-08 23:48:44 +00:00
2014-11-26 11:03:35 +01:00
2015-01-06 16:11:39 +01:00
2014-12-16 23:12:02 +02:00
2014-11-26 11:45:55 +01:00
2014-11-26 11:45:55 +01:00
2014-12-08 23:48:44 +00:00
2014-12-08 23:48:44 +00:00
2014-12-08 23:48:44 +00:00
2014-12-16 23:12:02 +02:00
2014-12-08 23:48:44 +00:00
2014-12-16 23:12:02 +02:00
2014-11-26 10:39:02 +01:00
2014-12-08 23:48:44 +00:00
2014-12-08 23:48:44 +00:00
2014-11-26 10:09:49 +01:00
2014-12-08 23:48:44 +00:00
2014-12-24 20:07:04 +02:00
2014-12-08 23:48:44 +00:00
2014-12-08 23:48:44 +00:00
2014-12-08 23:48:44 +00:00
2014-12-08 23:48:44 +00:00
2014-11-26 11:45:55 +01:00
2014-12-08 23:48:44 +00:00
2015-01-06 16:13:16 +01:00
2014-12-22 00:31:50 -05:00
2014-12-08 23:48:44 +00:00
2014-12-24 19:59:12 +02:00
2015-01-06 16:11:39 +01:00
2014-12-22 22:52:47 +00:00