Merge remote-tracking branch 'remotes/origin/master' into windows+cc
authorJohn Emmas <johne53@tiscali.co.uk>
Wed, 16 Oct 2013 14:55:59 +0000 (15:55 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Wed, 16 Oct 2013 14:55:59 +0000 (15:55 +0100)
commit75b933eadbe8f90a73a29bb207ff26eebcd4121a
tree65c8206dce7333a7eea5151a6c78126303e7cb26
parent97c68cc2b1f302521244e139a8a49019702038e7
parentcb3abec9665b7a69702294e5a6ffdd26f54885c3
Merge remote-tracking branch 'remotes/origin/master' into windows+cc
gtk2_ardour/ardour_ui.cc
gtk2_ardour/video_server_dialog.cc
libs/backends/jack/jack_utils.cc
wscript