Merge branch 'master' into no-self-connect
commit7533c6dad2636262e87e10c7dbef3583c29ff427
authorNedko Arnaudov <nedko@arnaudov.name>
Tue, 30 Jun 2009 21:45:18 +0000 (1 00:45 +0300)
committerNedko Arnaudov <nedko@arnaudov.name>
Tue, 30 Jun 2009 21:45:18 +0000 (1 00:45 +0300)
treee105061f12838d680f345cfc9ee10cc4d977a5a6
parent09cc6ddabe457ffa1b7edd8592bd3875ef00a3f4
parent9c52fb7c03f09b3f09fe538709934963d420a1ca
Merge branch 'master' into no-self-connect
common/JackEngine.cpp
common/Jackdmp.cpp