Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 12 Feb 2014 03:50:52 +0000 (22:50 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 12 Feb 2014 03:50:52 +0000 (22:50 -0500)
commit8f930477be9e2c88859a8ea30b213fba3f7fc443
tree09589a813848f61fec07425f7b63581d80ff0886
parent6876906d9db3f12fdf4b6e6ec621cb3fc99910dc
parentb75fb503fb53d46eebe85dbb3fb5b9f163d860a7
Merge branch 'master' into cairocanvas
gtk2_ardour/ardour_ui.cc