Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 4 Dec 2013 16:50:36 +0000 (11:50 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 4 Dec 2013 16:50:36 +0000 (11:50 -0500)
commit2ba2a50decb4b2f8b6b688dea495a2898124cc4f
tree324012a6dc5f0f8957a8268aa77ad16b5a7723a7
parent69df7763a19c56e83dd95b964c51172fbef7f22b
parentce7bfb489cc6f7522704f935ded4b4c438dc1c1e
Merge branch 'master' into windows
gtk2_ardour/ardour_ui.cc
libs/ardour/audioengine.cc