Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 14 Sep 2013 20:21:32 +0000 (16:21 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 14 Sep 2013 20:21:32 +0000 (16:21 -0400)
commit60da662affe9ade1db4ecb988006a1293cce49b4
tree2ebef5202700087d65a2fbf2eea8bf41ed6ea377
parent5cf1f7f3b28abd36f9390014016def94f4e1468d
parentf5191e62578bd2ba2b3e2adf8cfc3634aa4b929c
Merge branch 'master' into windows
libs/ardour/session_state.cc
wscript