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 /constants.h | |
| parent | 4d6851c77b1d02968e83e60b1dfbed28cd729408 (diff) | |
| parent | d116d404808e9ae9a7860c1eecf0b5974b91c994 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchange
Conflicts:
main.cpp
Diffstat (limited to 'constants.h')
| -rw-r--r-- | constants.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/constants.h b/constants.h index be76946..2982f31 100644 --- a/constants.h +++ b/constants.h @@ -1,5 +1,5 @@ -#ifndef CONSTANTS_H -#define CONSTANTS_H -#define szGPGModuleName "GPG" -#define PREF_METANODB 0x2000 -#endif +#ifndef CONSTANTS_H
+#define CONSTANTS_H
+#define szGPGModuleName "GPG"
+#define PREF_METANODB 0x2000
+#endif
|