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)
commitec6dd2dc8bff2c5c3058ce72f45d4585a0d0ff30
treeaaab96efb81b443972dc5bf195f97c60430d0bd0
parentb27700f10c6dac772f01f199869d2d28414b60e4
parent810a603fb2afa0a3be3e7154886e0ebe9824b93b
Merge branch 'nsm' of https://github.com/royvegard/ardour
gtk2_ardour/ardour_ui.cc