diff options
| author | nils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2012-03-05 23:28:03 +0100 |
|---|---|---|
| committer | nils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2012-03-05 23:28:03 +0100 |
| commit | 62f97b7defcf91661feb910bdae515f2cffd7a72 (patch) | |
| tree | f9dfa9b275f08a7c94f7ea5cc794aada618dd81d /keyserverimportdialog.cpp | |
| parent | updated TODO (diff) | |
| download | gpg4usb-62f97b7defcf91661feb910bdae515f2cffd7a72.tar.gz gpg4usb-62f97b7defcf91661feb910bdae515f2cffd7a72.zip | |
Merge branch '0.3.2-local'
Conflicts:
TODO
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@847 34ebc366-c3a9-4b3c-9f84-69acf7962910
Diffstat (limited to 'keyserverimportdialog.cpp')
0 files changed, 0 insertions, 0 deletions