Merge branch 'master' of https://github.com/nmains/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 20 Sep 2013 19:21:14 +0000 (15:21 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 20 Sep 2013 19:21:14 +0000 (15:21 -0400)
1  2 
libs/ardour/session.cc

Simple merge