| commit | 1557c4fddfb8107612350da4af4bb4d03bc76f43 | |
| author | falkTX <falktx@falktx.com> | |
| Mon, 27 May 2019 21:37:39 +0000 (27 23:37 +0200) | ||
| committer | falkTX <falktx@falktx.com> | |
| Mon, 27 May 2019 21:37:39 +0000 (27 23:37 +0200) | ||
| tree | 811a50a8a23558c9a6ff8ef211b6ba3937199012 | treesnapshot (tar.gz zip) |
| parent | bf8e5b5ea9322f95d0e0883bd2f4ee1f1cbbf6f2 | commitdiff |
| parent | f7f2244b07ee0a723853e838de85e25471b8903f | commitdiff |
Merge branch 'develop' of github.com:jackaudio/jack2 into develop
Signed-off-by: falkTX <falktx@falktx.com>
Conflicts:
common/JackEngine.cpp
common/JackEngine.h
Signed-off-by: falkTX <falktx@falktx.com>
Conflicts:
common/JackEngine.cpp
common/JackEngine.h
| common/JackEngine.cpp | diff1 | diff2 | blobhistory |