Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 9 Jul 2013 13:11:52 +0000 (09:11 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 9 Jul 2013 13:11:52 +0000 (09:11 -0400)
commit38f2aa51bd007eaeeaa8ee140143f70f7c53753a
tree66172c8ee65f6c2f2cc52b062622014fd2c7b8c3
parent37743ea9b1bfda241f8ada87470631acef1e5c4e
parent07be5beee7941a193fd55b584e72dbd9c8bea6fb
Merge branch 'master' into cairocanvas
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_window.cc
gtk2_ardour/gain_meter.cc
gtk2_ardour/midi_time_axis.cc
gtk2_ardour/step_editor.cc