diff options
| author | Robin Gareus <robin@gareus.org> | 2013-06-14 21:09:24 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-06-14 21:09:24 +0200 |
| commit | 11619a37bff79c050e39e434bc9899b516cbe4a1 (patch) | |
| tree | b95d913f0af41800a50298185c9ab4c42a12110d /gtk2_ardour/automation_selection.h | |
| parent | 46b6987311a305c1de718f8e73f365b796572c45 (diff) | |
| parent | 77ac803ba0b250cab5aa1778f8613d00020df82f (diff) | |
Merge branch 'master' into cairocanvas
Conflicts:
gtk2_ardour/editor_canvas.cc
gtk2_ardour/imageframe_time_axis.cc
gtk2_ardour/imageframe_time_axis.h
gtk2_ardour/imageframe_time_axis_group.cc
gtk2_ardour/imageframe_time_axis_group.h
gtk2_ardour/imageframe_time_axis_view.cc
gtk2_ardour/imageframe_time_axis_view.h
gtk2_ardour/imageframe_view.cc
gtk2_ardour/imageframe_view.h
gtk2_ardour/marker_time_axis.cc
gtk2_ardour/marker_time_axis.h
gtk2_ardour/marker_time_axis_view.cc
gtk2_ardour/marker_time_axis_view.h
gtk2_ardour/marker_view.cc
gtk2_ardour/marker_view.h
gtk2_ardour/video_image_frame.cc
gtk2_ardour/visual_time_axis.cc
gtk2_ardour/visual_time_axis.h
libs/canvas/canvas/circle.h
Diffstat (limited to 'gtk2_ardour/automation_selection.h')
0 files changed, 0 insertions, 0 deletions