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

[uzbl-mobile] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 5e79164..e1e5ca5 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,17 @@
-Alp Toker <alp@atoker.com>, Apple Inc - Original code taken from webkit example application, copyright 2006, 2007 Apple Inc and 2007 Alp Toker
 
-Dieter Plaetinck (Dieter@be) <http://dieter.plaetinck.be/> - Enhancements to form uzbl.
+Developers:
+    Dieter Plaetinck (Dieter@be) <dieter@plaetinck.be>
+    Dusan Popovic (dusanx)
+    Michael Walker (Barrucadu) <mike@barrucadu.co.uk>
+    Přemysl Hrubý, (anydot) <dfenze@gmail.com>
 
-Michael Walker (Barrucadu) <mike@barrucadu.co.uk> - Original threaded FIFO interface. Command adding methods.
+Contributors:
+    Robert Manea - Various improvements
+    Zane Ashby (HashBox) - Rewrote FIFO interface. Fixed various bugs.
+    (sentientswitch) - Cleaned up code. Added some commands.
+    Jan Kolkmeier (jouz) - scrolling
 
-Zane Ashby (HashBox) <http://demonastery.org> - Rewrote FIFO interface. Fixed various bugs.
-
-(sentientswitch) - Cleaned up code. Added some commands.
\ No newline at end of file
+Originaly based on http://trac.webkit.org/browser/trunk/WebKitTools/GtkLauncher/main.c
+Which is  copyrighted:
+2006, 2007 Apple Inc
+2007 Alp Toker <alp@atoker.com>