diff options
author | B Stack <bgstack15@gmail.com> | 2020-05-17 17:14:47 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2020-05-17 17:14:47 +0000 |
commit | cca3f71f16f85f5d506bf4bb7b3ec38fda31516a (patch) | |
tree | 1f52055b2f26fc2389d3ab4eb8d8d1e234a6316a /zen/thread.cpp | |
parent | Merge branch '10.23' into 'master' (diff) | |
parent | add upstream 10.24 (diff) | |
download | FreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.tar.gz FreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.tar.bz2 FreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.zip |
Merge branch '10.24' into 'master'
add upstream 10.24
See merge request opensource-tracking/FreeFileSync!21
Diffstat (limited to 'zen/thread.cpp')
-rw-r--r-- | zen/thread.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/zen/thread.cpp b/zen/thread.cpp index 6e8b8219..6b763f39 100644 --- a/zen/thread.cpp +++ b/zen/thread.cpp @@ -53,3 +53,5 @@ uint64_t zen::getMainThreadId() return globalMainThreadId; } + + |