Files
ardour/libs/pbd
John Emmas 19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
..
2009-04-30 16:47:51 +00:00
2013-09-06 14:31:11 +10:00
2009-02-25 18:26:51 +00:00
2012-06-23 03:51:34 +00:00
2009-02-25 18:26:51 +00:00
2009-02-25 18:26:51 +00:00
2013-01-16 18:15:38 +00:00
2009-04-18 16:15:12 +00:00
2013-01-16 18:15:38 +00:00
2013-01-16 18:15:38 +00:00
2009-02-25 18:26:51 +00:00
2012-06-23 03:51:41 +00:00
2013-08-24 12:18:06 -04:00