Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 7 Jun 2013 17:18:48 +0000 (13:18 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 7 Jun 2013 17:18:48 +0000 (13:18 -0400)
commit31d234b48c36bddb4d5228a3abee9c4419403879
treefdc4f5aebd2823a6a8ac64927e08d9919cd07b94
parentce8731b32d5e91f56396cb5f6ca0798bc7fed48a
parent327ec5f58e58224e01004ddfd0252a840a0e84f0
Merge branch 'master' into cairocanvas
gtk2_ardour/video_timeline.cc
wscript