Files
ardour/libs/gtkmm2ext
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
..
2013-08-24 11:46:45 -04:00
2013-01-16 18:27:41 +00:00
2011-03-01 23:28:02 +00:00
2010-03-16 19:16:23 +00:00
2011-11-28 21:07:22 +00:00
2013-09-16 22:02:36 -04:00
2011-11-02 14:57:16 +00:00
2013-05-08 14:48:28 -04:00