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-11-23 11:20:03 +00:00
2014-11-15 11:22:23 +00:00
2015-01-06 16:33:41 +01:00
2015-01-06 16:33:41 +01:00
2015-01-06 23:05:13 +01:00
2014-12-22 19:29:41 +00:00
2015-01-06 16:33:41 +01:00
2014-12-22 19:29:41 +00:00
2014-12-22 19:29:41 +00:00
2014-12-22 19:29:41 +00:00
2014-11-15 11:22:23 +00:00
2014-12-23 09:17:16 +00:00
2014-12-22 19:29:41 +00:00