Merge branch 'ripple-mode-cc' into cairocanvas
authorColin Fletcher <colin.m.fletcher@googlemail.com>
Tue, 1 Jul 2014 18:10:47 +0000 (19:10 +0100)
committerColin Fletcher <colin.m.fletcher@googlemail.com>
Tue, 1 Jul 2014 18:10:47 +0000 (19:10 +0100)
commite5e12acc5698090f2c0c614385e457cc0b46fbb0
tree3f4f28baba25f4e276d669d98ff485f7c51aa0b1
parent23e7cf10191270d70357ccf0ed9294f020c7b7ab
parentda65f3778c66dd2935709445c9a5dbd225296439
Merge branch 'ripple-mode-cc' into cairocanvas

Fix up merge conflicts in
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc

Also fix up compile errors.
13 files changed:
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_actions.cc
gtk2_ardour/editor_audio_import.cc
gtk2_ardour/editor_drag.cc
gtk2_ardour/editor_drag.h
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/route_time_axis.cc
libs/ardour/ardour/types.h
libs/ardour/enums.cc
libs/ardour/playlist.cc
libs/ardour/utils.cc