Merge branch 'new_gpg' into new_gpg_autoexchangenew_gpg_autoexchange

Conflicts:
	main.cpp
	messages.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/globals.h b/globals.h
index cafedab..e84ae1e 100644..100755
--- a/globals.h
+++ b/globals.h
@@ -1,4 +1,4 @@
-// Copyright © 2010 sss

+// Copyright © 2010-2012 sss

 // 

 // This program is free software; you can redistribute it and/or

 // modify it under the terms of the GNU General Public License

@@ -16,7 +16,7 @@
 

 #ifndef GLOBALS_H

 #define GLOBALS_H

-extern bool bAppendTags, gpg_configured;

+extern bool bAppendTags, bPresenceSigning, bStripTags, gpg_valid, gpg_keyexist, tabsrmm_used;

 extern TCHAR *inopentag, *inclosetag, *outopentag, *outclosetag;

 extern logtofile debuglog;

 #endif