Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 16 Jan 2014 22:26:50 +0000 (17:26 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 16 Jan 2014 22:26:50 +0000 (17:26 -0500)
commit2e27e21d3a09889311e18a8efe11abcaa6d9c8b3
tree709fb3509cf1005686117ec68e2465150727d3da
parent934e827420de65504450d25f25f79a2b6df5060f
parent10933e200369ecceb2c8b3a52be41b930955d269
Merge branch 'master' into cairocanvas
libs/ardour/ardour/auditioner.h
libs/ardour/route.cc
libs/ardour/session.cc