diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2011-03-17 22:11:24 +0200 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2011-03-17 22:11:24 +0200 |
| commit | be35d4a3d07f44604ad71e6c6997c47f8b5bcdde (patch) | |
| tree | 7e89c8fc32c2d95ddda18230deca7896f1f5d1e7 /gpg_wrapper.cpp | |
| parent | 4d6851c77b1d02968e83e60b1dfbed28cd729408 (diff) | |
| parent | d116d404808e9ae9a7860c1eecf0b5974b91c994 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchange
Conflicts:
main.cpp
Diffstat (limited to 'gpg_wrapper.cpp')
| -rw-r--r-- | gpg_wrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gpg_wrapper.cpp b/gpg_wrapper.cpp index de44233..3091566 100644 --- a/gpg_wrapper.cpp +++ b/gpg_wrapper.cpp @@ -159,4 +159,4 @@ void pxEexcute_thread(void *param) { debuglog<<time_str()<<": Gpg binary not found"; } -}
+} |