From df241143e81d89cdbe4de110578a547280375b37 Mon Sep 17 00:00:00 2001
From: nils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>
Date: Wed, 18 Jan 2012 01:07:59 +0000
Subject: updated TODO

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@750 34ebc366-c3a9-4b3c-9f84-69acf7962910
---
 TODO | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'TODO')

diff --git a/TODO b/TODO
index 808980d..9466bfd 100644
--- a/TODO
+++ b/TODO
@@ -24,6 +24,14 @@ Release 0.3.2
 	- if import failed, because no key was found [DONE]
 	- if key is already in keyring [DONE]
 	- BUG: Also show details, when key is really new [DONE]
+<<<<<<< HEAD
+=======
+- Wizard on first start (Create Key, Import from keys older gpg4usb, import from gnupg) [DONE]
+	- import conf from old gpg4usb
+	- only show one import dateil dialog, when importing public/private keys 
+	- always activate next button
+	- nextid is not called when clicking finish button
+>>>>>>> a rough new configuration of wizard. Pages are in right order
 - option in settingsdialog for enabling steganographic operations [DONE]
 	- minimal steganography option: remove or add pgp-headers on demand [DONE]
 	-  Add advanced tab to settings dialog [DONE]
-- 
cgit v1.2.3