summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r--ChangeLog.vserver23
1 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 5b0a27c..3e65375 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,8 +1,21 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
+ 17 Mar 2006; Christian Heim <phreak@gentoo.org>:
+ Merging latest changes to the baselayout/trunk changes. This merge is based
+ upon revision 1948.
+
+ ChangeLog | 15 +++++++++
+ ChangeLog.vserver | 23 +++++++++++---
+ net-scripts/init.d/net.lo | 2 +
+ net-scripts/net.modules.d/iwconfig | 29 ++++++++++++++++--
+ sbin/rc-daemon.sh | 2 -
+ sbin/rc-services.sh | 2 -
+ sbin/runscript.sh | 10 ++++--
+ 7 files changed, 71 insertions(+), 12 deletions(-)
+
11 Mar 2006; Christian Heim <phreak@gentoo.org>:
- Merging latest changes to the rc-scripts branch. This merge is based
+ Merging latest changes to the baselayout/trunk changes. This merge is based
upon revision 1943.
ChangeLog | 11 ++-
@@ -46,7 +59,7 @@
38 files changed, 312 insertions(+), 193 deletions(-)
09 Mar 2006; Christian Heim <phreak@gentoo.org>:
- Merging latest changes to the rc-scripts branch. This merge is based
+ Merging latest changes to the baselayout/trunk changes. This merge is based
upon revision 1939.
ChangeLog | 29 ++
@@ -66,7 +79,7 @@
14 files changed, 298 insertions(+), 218 deletions(-)
27 Feb 2006; Christian Heim <phreak@gentoo.org>:
- Merging latest changes to the rc-scripts branch. This merge is based
+ Merging latest changes to the baselayout/trunk changes. This merge is based
upon revision 1928.
ChangeLog | 16 ++
@@ -107,7 +120,7 @@
35 files changed, 388 insertions(+), 387 deletions(-)
23 Feb 2006; Christian Heim <phreak@gentoo.org>:
- Merging latest changes to the rc-scripts branch. This merge is based
+ Merging latest changes to the baselayout/trunk changes. This merge is based
upon revision 1924.
ChangeLog | 21 +
@@ -122,7 +135,7 @@
9 files changed, 179 insertions(+), 68 deletions(-)
17 Feb 2006; Christian Heim <phreak@gentoo.org>:
- Merging latest changes to the rc-scripts branch. This merge is based
+ Merging latest changes to the baselayout/trunk changes. This merge is based
upon revision 1909.
ChangeLog | 17 ++++-