diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-11-16 08:51:54 +0200 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-11-16 08:51:54 +0200 |
| commit | 46f48e58a81256148f74e5d753c708dd1ff3d563 (patch) | |
| tree | 8acb91d4fa98981e6af252a0f5e85d6101799540 /messages.cpp | |
| parent | f499a663032ad79a2e5ccfe6195b36f8645ca9f0 (diff) | |
| parent | 6cf18be1f2a73e501cf855de4db7dd57a52581d5 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchange
Conflicts:
main.cpp
Diffstat (limited to 'messages.cpp')
0 files changed, 0 insertions, 0 deletions