Merge remote-tracking branch 'remotes/origin/master' into windows+cc

author John Emmas <johne53@tiscali.co.uk>

Wed, 16 Oct 2013 14:55:59 +0000 (15:55 +0100)

committer John Emmas <johne53@tiscali.co.uk>

Wed, 16 Oct 2013 14:55:59 +0000 (15:55 +0100)
author John Emmas <johne53@tiscali.co.uk>
Wed, 16 Oct 2013 14:55:59 +0000 (15:55 +0100)
committer John Emmas <johne53@tiscali.co.uk>
Wed, 16 Oct 2013 14:55:59 +0000 (15:55 +0100)
diff --cc gtk2_ardour/ardour_ui.cc
Simple merge
diff --cc gtk2_ardour/video_server_dialog.cc
Simple merge
diff --cc libs/backends/jack/jack_utils.cc
Simple merge
diff --cc wscript
Simple merge
author	John Emmas <johne53@tiscali.co.uk>
	Wed, 16 Oct 2013 14:55:59 +0000 (15:55 +0100)
committer	John Emmas <johne53@tiscali.co.uk>
	Wed, 16 Oct 2013 14:55:59 +0000 (15:55 +0100)
		1	2
gtk2_ardour/ardour_ui.cc	patch \|	diff1 \|	diff2 \|	blob \| history
gtk2_ardour/video_server_dialog.cc	patch \|	diff1 \|	diff2 \|	blob \| history
libs/backends/jack/jack_utils.cc	patch \|	diff1 \|	diff2 \|	blob \| history
wscript	patch \|	diff1 \|	diff2 \|	blob \| history