Robin Gareus 11619a37bf 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		2013-06-14 21:09:24 +02:00
..
appleutility
ardour	Merge branch 'master' into cairocanvas	2013-06-14 21:09:24 +02:00
audiographer
canvas	move setup_outline_context() to a more sensible shared location	2013-05-02 18:21:35 -04:00
clearlooks-newer
clearlooks-older
evoral	reduce verbosity of DEBUG::Sequence traces	2013-05-02 10:11:31 -04:00
fst
gtkmm2ext	merge with master	2013-05-08 14:48:28 -04:00
libltc
midi++2	Revert all close-on-exec changes from earlier today	2013-06-07 21:07:41 +02:00
panners
pbd	merge with master	2013-06-13 23:00:24 -04:00
qm-dsp
rubberband
surfaces	merge with master	2013-06-13 23:00:24 -04:00
taglib
timecode
vamp-plugins
vamp-sdk