diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2012-07-29 01:01:18 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2012-07-29 01:01:18 +0300 |
| commit | 8ef18318d8f81a533c0e3bc5c10c76fec0be3b5f (patch) | |
| tree | 88eb30555006e99e5cc446eee4520f3f955eae99 /jabber_account.cpp | |
| parent | 191c2e330ab91f4b35860e08c5424667ed1893c5 (diff) | |
| parent | 64c6452c697a05ab0b0d4bbbda167ddc35215397 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchangenew_gpg_autoexchange
Conflicts:
main.cpp
messages.cpp
Diffstat (limited to 'jabber_account.cpp')
| -rwxr-xr-x[-rw-r--r--] | jabber_account.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jabber_account.cpp b/jabber_account.cpp index 9dedd56..6a264a4 100644..100755 --- a/jabber_account.cpp +++ b/jabber_account.cpp @@ -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
|