summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-02-23 13:39:22 +0000
committerChristian Heim <phreak@gentoo.org>2006-02-23 13:39:22 +0000
commita2c749b6b0e3e3fc03edf067486d950d494a9ff3 (patch)
tree0ae717a18dc285e9aee74b77d583ac1fe21eb99d /ChangeLog.vserver
parentMerging r1909 (diff)
downloadbaselayout-vserver-a2c749b6b0e3e3fc03edf067486d950d494a9ff3.tar.gz
baselayout-vserver-a2c749b6b0e3e3fc03edf067486d950d494a9ff3.tar.bz2
baselayout-vserver-a2c749b6b0e3e3fc03edf067486d950d494a9ff3.zip
Merging baselayout r1924
svn path=/baselayout-vserver/trunk/; revision=252
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r--ChangeLog.vserver15
1 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 3658feb..32cface 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,21 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
+ 23 Feb 2006; Christian Heim <phreak@gentoo.org>:
+ Merging latest changes to the rc-scripts branch. This merge is based
+ upon revision 1924.
+
+ ChangeLog | 21 +
+ ChangeLog.vserver | 15 +
+ net-scripts/conf.d/net.example | 2
+ net-scripts/net.modules.d/helpers.d/functions | 2
+ net-scripts/net.modules.d/ifplugd | 5
+ net-scripts/net.modules.d/netplugd | 5
+ net-scripts/net.modules.d/wpa_supplicant | 4
+ sbin/functions.sh | 2
+ sbin/rc-update | 191 ++++++++++++------
+ 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
upon revision 1909.