Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
authorJohn Emmas <johne53@tiscali.co.uk>
Wed, 31 Jul 2013 14:09:50 +0000 (15:09 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Wed, 31 Jul 2013 14:09:50 +0000 (15:09 +0100)
commit98c6ca5abcb8901f70b2790ecd9cec51385fab6b
tree74e5d42c37f7f5a68d4bf4176170e0ce9df88018
parent1828f5694fc8a5971fb8f4f58d8b9abc05434c63
parentb889a3d2f999dc97f21bbba4603ccdc349ba5bf2
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows