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 /new_gpg.sln | |
| parent | 191c2e330ab91f4b35860e08c5424667ed1893c5 (diff) | |
| parent | 64c6452c697a05ab0b0d4bbbda167ddc35215397 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchangenew_gpg_autoexchange
Conflicts:
main.cpp
messages.cpp
Diffstat (limited to 'new_gpg.sln')
| -rwxr-xr-x[-rw-r--r--] | new_gpg.sln | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/new_gpg.sln b/new_gpg.sln index 6a74e17..6a74e17 100644..100755 --- a/new_gpg.sln +++ b/new_gpg.sln |