Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 18 Sep 2013 01:22:56 +0000 (21:22 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 18 Sep 2013 01:22:56 +0000 (21:22 -0400)
1  2 
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
libs/ardour/audioengine.cc

Simple merge
Simple merge
Simple merge