Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 6 Sep 2013 14:56:36 +0000 (10:56 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 6 Sep 2013 14:56:36 +0000 (10:56 -0400)
commit8c5cff60912c7e0a7256f635641399500d8d00d9
tree369361e504019597e890de385dfb64484e940645
parent8216eac044ec392944acd17571a4065cf0365cf2
parent4a135c82fba6775e71bde1d709a163876381f82a
Merge branch 'master' into windows
gtk2_ardour/export_video_dialog.cc
wscript