Merge branch 'master' of git://github.com/Dieterbe/uzbl into dieter/master

1 files changed, 8 insertions, 2 deletions

diff --git a/TODO b/TODO
index b4c70bf..3e4cfd3 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,12 @@
 * implement all the ideas from README
+* Support for arguments to commands (argc/argv-like structure?).
+* Support for binding keyboard shortcuts in config file.
+* where to put proxy config? webkit support?
 * do not store the 'http://' part in the history file
 * improve commandline arguments
+* have a better look at /merge the fifo code from barrucadu and friends
 
-* Support for arguments to commands (argc/argv-like structure?).
-* Support for binding keyboard shortcuts in config file.
+
+SOMEDAY:
+figure out caching with webkit and in general how we can speed everything
+figure out how webkit intercepts key input