summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-06-05 19:46:54 +0000
committerChristian Heim <phreak@gentoo.org>2006-06-05 19:46:54 +0000
commitae0bbf3ae39e23600345b42edfe2ac1babcb4dc0 (patch)
treea7b020f26114e96c9949a4a4cb38f1f9d77ebd8c /ChangeLog.vserver
parentMerging r2046 (diff)
downloadbaselayout-vserver-ae0bbf3ae39e23600345b42edfe2ac1babcb4dc0.tar.gz
baselayout-vserver-ae0bbf3ae39e23600345b42edfe2ac1babcb4dc0.tar.bz2
baselayout-vserver-ae0bbf3ae39e23600345b42edfe2ac1babcb4dc0.zip
Merging r2079
svn path=/baselayout-vserver/trunk/; revision=372
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 61e2bd2..4f4daef 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
+ 05 Jun 2006; Christian Heim <phreak@gentoo.org>:
+ Merging latest changes to the baselayout/trunk changes. This merge is based
+ upon revision 2079.
+
25 May 2006; Christian Heim <phreak@gentoo.org>:
Merging latest changes to the baselayout/trunk changes. This merge is based
upon revision 2046.