Merge branch 'nsm' of https://github.com/royvegard/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 5 Apr 2013 16:00:42 +0000 (12:00 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 5 Apr 2013 16:00:42 +0000 (12:00 -0400)
commitfcf7530676f840e4444213a27afb53255010d0d8
tree9066930357fdb73427c259e673f76dd6e5e46453
parent55a10480945f2a41fe6cfda2173bed12d3d5bc89
parent11747ab16c873412c667a8876d12c2232f58ffa2
Merge branch 'nsm' of https://github.com/royvegard/ardour