| commit | 13f7852c2667ff6f6be5c0e7e94f7699b6629ade | |
| author | Nedko Arnaudov <nedko@arnaudov.name> | |
| Mon, 18 Jun 2012 22:26:47 +0000 (19 01:26 +0300) | ||
| committer | Nedko Arnaudov <nedko@arnaudov.name> | |
| Mon, 18 Jun 2012 22:26:47 +0000 (19 01:26 +0300) | ||
| tree | 244f3373961802eeb1da6af94de4a1589c5d6daa | treesnapshot (tar.gz zip) |
| parent | cf36c02aeb303ba8ae7fe37819a210d223004823 | commitdiff |
| parent | 007cdc37142a441e51b8ff27fb2e249bf8bcc916 | commitdiff |
Merge branch 'master' into param-order
Conflicts:
common/JackControlAPI.cpp
Conflicts:
common/JackControlAPI.cpp
| common/JackControlAPI.cpp | diff1 | diff2 | blobhistory |