merge fix
authorBen Loftis <ben@harrisonconsoles.com>
Wed, 3 Sep 2014 20:21:09 +0000 (15:21 -0500)
committerBen Loftis <ben@harrisonconsoles.com>
Wed, 3 Sep 2014 20:26:33 +0000 (15:26 -0500)
commit0d4460b736fad374203871a5af305eabdb558dea
treea1da41e60053f424960d02569f994fc62fc9f1be
parent69ac29d3752ad18ffcac15c9579116d7e0d67670
merge fix
gtk2_ardour/ardour_button.cc