Merge branch 'master' into ladi-experimental
commit2b378a2d69f693a473bb185d55b67525c7cef9a1
authorNedko Arnaudov <nedko@arnaudov.name>
Sat, 22 Sep 2012 14:05:08 +0000 (22 17:05 +0300)
committerNedko Arnaudov <nedko@arnaudov.name>
Sat, 22 Sep 2012 14:05:08 +0000 (22 17:05 +0300)
tree236130b3062dddea57e0164880613186efd355ae
parent08acaf689600b3dbbbe56fdb3f1d6ddf38a49f5a
parent7c6d11160ffad2209a97f553470f02fcf69c69c7
Merge branch 'master' into ladi-experimental
common/JackControlAPI.cpp
common/JackServerGlobals.cpp
common/Jackdmp.cpp