summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-05-25 10:09:00 +0000
committerChristian Heim <phreak@gentoo.org>2006-05-25 10:09:00 +0000
commit641e205510a26ca3ae4ed9d3f7e27221e2656bb7 (patch)
tree86e317c5d043dfbde91cb981229623ca4a189c52 /ChangeLog.vserver
parentMerging baselayout r2022 for branches/rc-scripts_1_6, branches/baselayout-1_1... (diff)
downloadbaselayout-vserver-641e205510a26ca3ae4ed9d3f7e27221e2656bb7.tar.gz
baselayout-vserver-641e205510a26ca3ae4ed9d3f7e27221e2656bb7.tar.bz2
baselayout-vserver-641e205510a26ca3ae4ed9d3f7e27221e2656bb7.zip
Merging r2046
svn path=/baselayout-vserver/trunk/; revision=365
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r--ChangeLog.vserver4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 169ca5c..61e2bd2 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
+ 25 May 2006; Christian Heim <phreak@gentoo.org>:
+ Merging latest changes to the baselayout/trunk changes. This merge is based
+ upon revision 2046.
+
21 Apr 2006; Christian Heim <phreak@gentoo.org>:
Merging latest changes to the baselayout/trunk changes. This merge is based
upon revision 2014.