Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
authorJohn Emmas <johne53@tiscali.co.uk>
Tue, 6 Aug 2013 14:18:27 +0000 (15:18 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Tue, 6 Aug 2013 14:18:27 +0000 (15:18 +0100)
commit7169c77cfc5a45ec29dcb58a251feccba5ac6b62
tree41273a75464ba2305305f1db9c8ee21d0032edb3
parent0dc8806ee473f96d1f480f7a50b7a39efaf6d90a
parent2732c64c07f20aaafcee0e9264f7d5279fbd5708
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows