Robin Gareus cc92c879bf Merge branch 'master' into ccmerge ...

Conflicts:
	gtk2_ardour/ardour_ui_options.cc
	gtk2_ardour/generic_pluginui.cc
	gtk2_ardour/level_meter.cc
	gtk2_ardour/utils.cc
	gtk2_ardour/utils.h
	gtk2_ardour/video_image_frame.cc

2013-08-10 15:41:40 +02:00

34 KiB

Raw Blame History

View Raw