Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 17 Jan 2014 14:13:44 +0000 (09:13 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 17 Jan 2014 14:13:44 +0000 (09:13 -0500)
commitc0e6f8e4c324c3f44613949b59acd9e864ab263d
tree00bd7f9c979bb2a971b4f55ae4113c7442645eda
parent2e27e21d3a09889311e18a8efe11abcaa6d9c8b3
parent0479405e2f0cd44b75ba789cd620cb43bb9f9ffb
Merge branch 'master' into cairocanvas
gtk2_ardour/sfdb_ui.cc
libs/ardour/ardour/auditioner.h
libs/ardour/butler.cc