summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-06-03 16:37:53 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2014-06-03 16:37:53 -0400
commit8fa81c1436335a44577cbb725a53b40fac56adaa (patch)
tree67898238fb35540b654686a70f0269fb7924c422 /gtk2_ardour
parente0533e9dd7df504236892fe0d8693e7ad9a6a278 (diff)
merge onecanvas and cairocanvas branches, and manually resolve conflicts, including rounding in item_to_window() methods
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor_drag.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 44b50d0131..7004f9b419 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1,4 +1,4 @@
-*
+/*
Copyright (C) 2009 Paul Davis
This program is free software; you can redistribute it and/or modify