Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
authorJohn Emmas <johne53@tiscali.co.uk>
Fri, 9 Aug 2013 17:04:04 +0000 (18:04 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Fri, 9 Aug 2013 17:04:04 +0000 (18:04 +0100)
commit8cd71108c1d153f84f25c3b9e5153a110826c130
tree6518ec0abd7c241b81e9c0f245214ac6e697de35
parent5f703f25a9c73912d2d28c29c52130e5f363c768
parent031675f79566a5400f6109d90a1ec824dce76945
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows