| commit | 95025eda1c6f3ad62b592b761f999ab1ffc80f45 | |
| author | Nedko Arnaudov <nedko@arnaudov.name> | |
| Sat, 26 May 2012 14:18:04 +0000 (26 17:18 +0300) | ||
| committer | Nedko Arnaudov <nedko@arnaudov.name> | |
| Sat, 26 May 2012 14:18:04 +0000 (26 17:18 +0300) | ||
| tree | 8539dafe2bab48b96b08ba2aa5cf58abc232d8b5 | treesnapshot (tar.gz zip) |
| parent | 0de30ae457fe037db4f7d0c45c406e28c9d60039 | commitdiff |
| parent | cf36c02aeb303ba8ae7fe37819a210d223004823 | commitdiff |
Merge branch 'param-order' into ladi-param-order-1.9.8
Conflicts:
common/JackControlAPI.cpp
Conflicts:
common/JackControlAPI.cpp
| common/JackControlAPI.cpp | diff1 | diff2 | blobhistory |