11619a37bff79c050e39e434bc9899b516cbe4a1
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
Please see the Ardour web site at http://ardour.org/ for all documentation..
For information on building ardour:
http://ardour.org/development.html
Description
Languages
C++
56.5%
C
39.6%
JavaScript
1.3%
Lua
0.9%
Python
0.6%
Other
0.9%