[Gzz-commits] journals hemppah

[Hermanni Hyytiälä]

CVSROOT:        /cvsroot/fenfire
Module name:    journals
Branch:         
Changes by:     Hermanni Hyytiälä <address@hidden>      03/07/16 08:20:40

Modified files:
        .              : hemppah 

Log message:
        vacation added

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

Patches:
Index: journals/hemppah
diff -u journals/hemppah:1.22 journals/hemppah:1.23
--- journals/hemppah:1.22       Tue Jul 15 07:35:34 2003
+++ journals/hemppah    Wed Jul 16 08:20:39 2003
@@ -42,6 +42,12 @@
 Short term
 ----------
 
+August
+------
+
+2003-8-9-2003-8-23: vacation    
+      - 2003-8-17 - 2003-8-24: the island of Samos, Greece
+
 July
 ----
    - Work for Storm with benja:
@@ -80,8 +86,7 @@
       - additionally, there are a number of branches which 
         form a "star" around the "central branch"
     - study multi-branch merging
-      - merging various branches whilen each of the 
-        branches have previously merged with 
+      - merging various branches while each of the branches have previously 
merged with 
        some of the others
     - study the theory behind DARCS
     - DARCS and arch seem most promising w.r.t. advanced merging/versioning