Merge branch 'windows' into windows+cc
authorJohn Emmas <johne53@tiscali.co.uk>
Fri, 11 Oct 2013 17:23:53 +0000 (18:23 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Fri, 11 Oct 2013 17:23:53 +0000 (18:23 +0100)
commitfa71d82dda08558caf4a9c5102016f2746883d10
treeaa5d0b7bc074a8d06e3cdb23ad0d4e1646c64c99
parent300b484cf6ac14c15e365c4062345d64a61c4b18
parent2a6a16f980ff9181b138f7a30aedfbde4426a591
Merge branch 'windows' into windows+cc
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
libs/ardour/wscript
libs/backends/jack/wscript
wscript