Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 26 Apr 2013 18:20:11 +0000 (14:20 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 26 Apr 2013 18:20:11 +0000 (14:20 -0400)
commit54bf06e63cee78dfa218f604d862e577d0f5754c
tree0704568dd2b154cc10e52b16b36d54cdb187d5d8
parent41d68e780f13df893992a5842a44ed51a094ee87
parentdb34831b183d511d76ea1f29606e1933e5ad4caf
Merge branch 'master' into cairocanvas
gtk2_ardour/ardour_ui.h
gtk2_ardour/editor.cc
gtk2_ardour/editor.h