diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2011-04-01 02:24:07 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2011-04-01 02:24:07 +0300 |
| commit | a7823b56a5b08f81248e83804349bc8e9fc61206 (patch) | |
| tree | 9d2e3a7a558498be03513c96c35796b948418115 /clist.cpp | |
| parent | b0e1bb306eec7f2d13ff385d4c1191646cc3e7f9 (diff) | |
| parent | 8cdda41b119526a2741938d57b7e066e1697315b (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchange
Conflicts:
messages.cpp
Diffstat (limited to 'clist.cpp')
0 files changed, 0 insertions, 0 deletions