diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-07-01 19:10:47 +0100 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-07-01 19:10:47 +0100 |
| commit | e5e12acc5698090f2c0c614385e457cc0b46fbb0 (patch) | |
| tree | 3f4f28baba25f4e276d669d98ff485f7c51aa0b1 /gtk2_ardour/editor_items.h | |
| parent | 23e7cf10191270d70357ccf0ed9294f020c7b7ab (diff) | |
| parent | da65f3778c66dd2935709445c9a5dbd225296439 (diff) | |
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.
Diffstat (limited to 'gtk2_ardour/editor_items.h')
0 files changed, 0 insertions, 0 deletions