Merged [14058]:
commit619a64bb60e3a8cc7f7bf749d96a5931f4309688
authorEvan Schoenberg <evan@adiumx.com>
Sat, 19 Nov 2005 09:13:28 +0000 (19 09:13 +0000)
committerEvan Schoenberg <evan@adiumx.com>
Sat, 19 Nov 2005 09:13:28 +0000 (19 09:13 +0000)
treeac484d17b8c022e73d30c11454dfdc737f6c7e04
parent0c577796604152fa897ce7b4b57fea3d5dda3db2
Merged [14058]:
 * Added ability to verify (and unverify) a contact's identity once in an OTR session
 * Added Encryption menu to the Contact menu and the chat contextual menu

git-svn-id: svn://svn.adiumx.com/adium/branches/adium-0.8@14060 1c916fce-81e2-0310-a464-8ca513f45935
Frameworks/Adium Framework/AIAccount.h
Frameworks/Adium Framework/AIAccount.m
Frameworks/Adium Framework/TextAndButtonsWindow.nib/keyedobjects.nib
Plugins/Gaim Service/CBGaimAccount.m
Plugins/Gaim Service/ESGaimOTRUnknownFingerprintController.h
Plugins/Gaim Service/ESGaimOTRUnknownFingerprintController.m
Plugins/Gaim Service/SLGaimCocoaAdapter.m
Plugins/Gaim Service/adiumGaimOTR.h
Plugins/Gaim Service/adiumGaimOTR.m
Plugins/Secure Messaging/ESSecureMessagingPlugin.h
Plugins/Secure Messaging/ESSecureMessagingPlugin.m