| commit | 185f245aac3e1fb032c70e73e732208b17d6b793 | |
| author | Nedko Arnaudov <nedko@arnaudov.name> | |
| Mon, 28 Mar 2011 21:05:52 +0000 (29 00:05 +0300) | ||
| committer | Nedko Arnaudov <nedko@arnaudov.name> | |
| Mon, 28 Mar 2011 21:05:52 +0000 (29 00:05 +0300) | ||
| tree | c66908cae73f1d272bb8592ddfa7d04bcb845bb8 | treesnapshot (tar.gz zip) |
| parent | 1685eec0b04bc0b233d88e23b3e805b7c9034269 | commitdiff |
| parent | ed5254060095b7a66bd1f5353d8c6ec77cf59973 | commitdiff |
Merge branch 'master' into no-self-connect
Conflicts:
common/JackServer.cpp
Conflicts:
common/JackServer.cpp