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)
commitce8731b32d5e91f56396cb5f6ca0798bc7fed48a
tree0906e655441185e51677d41e76a5d075f59a94af
parentbebe2af95ad9999fdca719450dc2c70cfb849076
parent8bfaa2d3d9e7712a238651c487c761e70b20f6ab
Merge branch 'master' into cairocanvas
gtk2_ardour/midi_time_axis.cc
gtk2_ardour/step_editor.cc