[svn] - keyword-subst from charybdis 2.2.

[solanum.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 89c124ac70cfd97fdf4fd0a1065ce870ac05400c..a950e7ef2d8b660dcf97ddedadfb22eab19b9428 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,72 @@
+nenolod     2007/01/25 07:00:49 UTC    (20070125-3157)
+  Log:
+  Removed merge tracking for "svnmerge" for 
+  http://svn.atheme.org/charybdis/branches/release-2.2
+  
+
+  Changes:     Modified:
+  + -          trunk/  (Property Modified)
+
+
+nenolod     2007/01/25 06:59:58 UTC    (20070125-3155)
+  Log:
+  Initialized merge tracking via "svnmerge" with revisions "1-1919" from 
+  http://svn.atheme.org/charybdis/branches/release-2.2
+  
+
+  Changes:     Modified:
+  + -          trunk/  (Property Modified)
+
+
+nenolod     2007/01/25 06:59:30 UTC    (20070125-3153)
+  Log:
+  Removed merge tracking for "svnmerge" for 
+  http://svn.atheme.org/charybdis/branches/release-2.2
+  
+
+  Changes:     Modified:
+  + -          trunk/  (Property Modified)
+
+
+nenolod     2007/01/25 06:58:41 UTC    (20070125-3151)
+  Log:
+  Initialized merge tracking via "svnmerge" with revisions "1-2190" from 
+  http://svn.atheme.org/charybdis/branches/release-2.2
+  
+
+  Changes:     Modified:
+  + -          trunk/  (Property Modified)
+
+
+nenolod     2007/01/25 06:57:47 UTC    (20070125-3149)
+  Log:
+  - bleah
+  
+
+  Changes:     Modified:
+  + -          trunk/  (Property Modified)
+
+
+nenolod     2007/01/25 06:50:46 UTC    (20070125-3147)
+  Log:
+  Initialized merge tracking via "svnmerge" with revisions "1-3146" from 
+  http://svn.atheme.org/charybdis/branches/release-2.2
+  
+
+  Changes:     Modified:
+  + -          trunk/  (Property Modified)
+
+
+nenolod     2007/01/25 06:45:04 UTC    (20070125-3145)
+  Log:
+  - version bump to 2.2.0
+  
+
+  Changes:     Modified:
+  +3 -1                trunk/NEWS (File Modified) 
+  +1 -1                trunk/configure.ac (File Modified) 
+
+
 nenolod     2007/01/25 06:40:21 UTC    (20070125-3143)
   Log:
   - the new plan: