Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 6 Jun 2013 13:52:21 +0000 (09:52 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 6 Jun 2013 13:52:21 +0000 (09:52 -0400)
1  2 
gtk2_ardour/midi_time_axis.cc
gtk2_ardour/step_editor.cc

Simple merge
Simple merge