From: John Hodge <tpg@mutabah.net>
Date: Tue, 14 Aug 2012 08:35:14 +0000 (+0800)
Subject: Merge branch 'master' of git://localhost/acess2
X-Git-Tag: rel0.15~611^2~7
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=fb3abbad5dfd71ea2b190d0b33d9c57e879fb15a;p=tpg%2Facess2.git

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

Conflicts:
	TODO.txt
---

fb3abbad5dfd71ea2b190d0b33d9c57e879fb15a
diff --cc TODO.txt
index 8a75c218,f6c8efa9..5ac59f47
--- a/TODO.txt
+++ b/TODO.txt
@@@ -46,7 -46,7 +46,8 @@@ 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
   > Debug speed issues (tracing agian)