13
0
livetrax/libs
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 Fix some compilation warnings 2013-03-23 14:50:58 +01:00
canvas move setup_outline_context() to a more sensible shared location 2013-05-02 18:21:35 -04:00
clearlooks-newer Fix some compilation warnings 2013-03-30 18:09:40 +01:00
clearlooks-older
evoral reduce verbosity of DEBUG::Sequence traces 2013-05-02 10:11:31 -04:00
fst disable unused windows-vst / ALSA-MIDI code 2013-02-19 22:17:20 +00:00
gtkmm2ext merge with master 2013-05-08 14:48:28 -04:00
libltc merge robin gareus' libltc into ardour source tree for convenience 2012-12-14 16:18:47 +00:00
midi++2 Revert all close-on-exec changes from earlier today 2013-06-07 21:07:41 +02:00
panners add copyright comments 2013-01-16 18:22:15 +00:00
pbd merge with master 2013-06-13 23:00:24 -04:00
qm-dsp Fix some compilation warnings 2013-03-23 14:50:58 +01:00
rubberband Fix some compilation warnings 2013-03-23 14:50:58 +01:00
surfaces merge with master 2013-06-13 23:00:24 -04:00
taglib
timecode fix drop-frame TC subframe rounding 2012-11-18 09:53:11 +00:00
vamp-plugins
vamp-sdk fix up discovery of VAMP plugins after ./waf install, which fixes crashes when reversing regions and doing timeFX operations with a "regular" install of ardour3 2012-12-18 15:26:50 +00:00