Merge branch 'master' of https://github.com/johnwpoliver/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 5 Jun 2013 17:19:23 +0000 (13:19 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 5 Jun 2013 17:19:23 +0000 (13:19 -0400)
commitcd8180c864f5d02d7ce0515ed9f5b2ff4f6e1901
tree8cc027c96e3efa9d45efb0fb6e7835c2c6e7a63d
parent2b80aee20a01f70afe9997fd39c4ca8d19c8caf8
parenta65ab1d76c09e11ffddb4b8dcffa167b37e76dc6
Merge branch 'master' of https://github.com/johnwpoliver/ardour
gtk2_ardour/ardour_ui.cc