Commit graph

2 commits

Author SHA1 Message Date
Paul Davis
6e824e7797 merge 12717:12954 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12955 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 13:30:03 +00:00
Paul Davis
8e1db53556 merge -r12436:12545 from 3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12546 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-02 16:21:08 +00:00