Files
ardour/libs/pbd/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
..
2013-03-20 20:17:56 +01:00
2013-01-16 18:51:39 +00:00
2011-01-19 21:52:46 +00:00
2013-04-22 19:21:16 +02:00
2013-07-17 19:29:34 +10:00
2013-01-16 18:51:39 +00:00
2009-02-25 18:26:51 +00:00
2013-01-16 18:51:39 +00:00
2013-08-13 20:15:47 +10:00
2013-08-08 15:26:16 -04:00
2009-02-25 18:26:51 +00:00
2013-01-16 18:51:39 +00:00
2012-01-18 01:34:53 +00:00
2013-07-11 12:30:32 -04:00
2013-01-16 18:51:39 +00:00