Merge branch 'master' of git://localhost/acess2

Conflicts:
	TODO.txt

diff --git a/TODO.txt b/TODO.txt
index f6c8efa..5ac59f4 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -46,6 +46,7 @@ TODO:
 - AxWin3
  > Text editor (with a GP formatted text field?)
  > Maybe a basic web browser using the surface support?
+ > Port freetype for nice font support
  > Configuration (via lib/server)
 
 - Omnispeak