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)
1  2 
gtk2_ardour/sfdb_ui.cc
libs/ardour/ardour/auditioner.h
libs/ardour/butler.cc

Simple merge
Simple merge
Simple merge