[Gzz-commits] journals tjl

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    journals
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/09 08:33:05

Modified files:
        .              : tjl 

Log message:
        resolve

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/journals/tjl.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: journals/tjl
diff -u journals/tjl:1.23 journals/tjl:1.24
--- journals/tjl:1.23   Wed Apr  9 08:32:04 2003
+++ journals/tjl        Wed Apr  9 08:33:05 2003
@@ -46,20 +46,8 @@
     - more improvements to alph span serialization
        - fake spans
        - central class that can initialize from system properties. 
-
-<<<<<<< tjl
-2003-04-08:
     - deliver borrowed book to L.H.
 
-2003-04-06
-    - AGPU proposals
-    - implement model_management with tests
-    - see why links are not shown in xupdf fenfire version
-       - check and design the indexing stuff.
-    - clean up fenfire demo stuff
-       - PageSpanLayout factory
-=======
->>>>>>> 1.21
     - second mouse input to vob demos
     - try lego controller zooming
     - implement model_management with tests
@@ -71,6 +59,7 @@
            - PageSpanLayout factory
 
 2003-04-09:
+    - AGPU font stuff
     - PEG project management tool's scope
     - find out who knows XML best and would like to define our
       XHTML stuff