Merge branch 'master' into ladi-experimental
commit486f16a852fc7a68d4225ac36e4756f08aa24bc9
authorNedko Arnaudov <nedko@arnaudov.name>
Wed, 24 Oct 2012 11:17:51 +0000 (24 14:17 +0300)
committerNedko Arnaudov <nedko@arnaudov.name>
Wed, 24 Oct 2012 11:17:51 +0000 (24 14:17 +0300)
tree30721cacf205f0caaf43e43e679d0d6ddb4c0fba
parent2b378a2d69f693a473bb185d55b67525c7cef9a1
parent700489b429b0edb7046b169278e3e6751e3e59fc
Merge branch 'master' into ladi-experimental
common/JackLockedEngine.h
common/JackServer.cpp