Files
ardour/libs/ardour
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-09-06 14:31:11 +10:00
2013-08-08 15:26:18 -04:00
2013-01-16 18:14:11 +00:00
2013-01-16 18:14:11 +00:00
2012-11-14 20:38:48 +00:00
2013-08-24 12:18:06 -04:00
2013-01-16 18:14:11 +00:00
2013-08-24 14:23:25 +02:00
2013-01-16 18:14:11 +00:00
2013-08-08 15:26:18 -04:00
2013-01-16 18:14:11 +00:00
2012-03-01 21:08:58 +00:00
2013-08-08 15:23:09 -04:00
2013-09-13 11:55:56 -04:00
2013-09-14 16:42:40 -04:00
2013-08-08 15:26:18 -04:00
2013-08-08 15:26:18 -04:00
2013-01-09 15:09:13 +00:00
2013-09-16 22:11:06 -04:00
2013-01-16 18:14:11 +00:00
2013-01-16 18:14:11 +00:00