ardour/livetrax
13
0
Fork 0
Code
d382925fba
livetrax/libs/backends
History
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
..
jack Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows 2013-09-21 09:17:25 +01:00
wscript