diff options
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index d45ab9a7ff..b874964ca4 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -249,15 +249,8 @@ Editor::initialize_canvas () vector<TargetEntry> target_table; -<<<<<<< HEAD - // Drag-N-Drop from the region list can generate this target - target_table.push_back (TargetEntry ("regions")); - -======= target_table.push_back (TargetEntry ("regions")); // DnD from the region list will generate this target target_table.push_back (TargetEntry ("sources")); // DnD from the source list will generate this target - target_table.push_back (TargetEntry ("text/plain")); ->>>>>>> Source list: Fix drag-n-drop. target_table.push_back (TargetEntry ("text/uri-list")); target_table.push_back (TargetEntry ("text/plain")); target_table.push_back (TargetEntry ("application/x-rootwin-drop")); |