Merge branch 'nsm' of https://github.com/royvegard/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 3 Apr 2013 14:35:47 +0000 (10:35 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 3 Apr 2013 14:35:47 +0000 (10:35 -0400)
1  2 
gtk2_ardour/ardour_ui.cc

Simple merge