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)
1  2 
libs/ardour/session_state.cc
wscript

Simple merge
diff --cc wscript
Simple merge