diff options
author | Daniel Wilhelm <shieldwed@outlook.com> | 2019-12-30 10:35:19 +0000 |
---|---|---|
committer | Daniel Wilhelm <shieldwed@outlook.com> | 2019-12-30 10:35:19 +0000 |
commit | f790cdc5775bb1234a9c2666218456d80825966e (patch) | |
tree | cf344e045d5ebdffe0afc35f2de68b8908857808 /zen/globals.h | |
parent | Merge branch '10.18' into 'master' (diff) | |
parent | add upstream 10.19 (diff) | |
download | FreeFileSync-f790cdc5775bb1234a9c2666218456d80825966e.tar.gz FreeFileSync-f790cdc5775bb1234a9c2666218456d80825966e.tar.bz2 FreeFileSync-f790cdc5775bb1234a9c2666218456d80825966e.zip |
Merge branch '10.19' into 'master'10.19
add upstream 10.19
See merge request opensource-tracking/FreeFileSync!16
Diffstat (limited to 'zen/globals.h')
-rw-r--r-- | zen/globals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zen/globals.h b/zen/globals.h index e59d64c1..4c1453a2 100644 --- a/zen/globals.h +++ b/zen/globals.h @@ -206,7 +206,7 @@ void registerGlobalForDestruction(CleanUpEntry& entry) //------------------------------------------------------------------------------------------ #if __cpp_lib_atomic_wait -#error implement + rewiew improvements + #error implement + rewiew improvements #endif |