Merge branch 'rspezial'
authorChristian Schmidt <maniacikarus@ipfire.org>
Fri, 13 Jun 2008 15:14:55 +0000 (17:14 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Fri, 13 Jun 2008 15:14:55 +0000 (17:14 +0200)
Conflicts:

config/rootfiles/core/15/files
config/rootfiles/core/15/update.sh
lfs/collectd
make.sh

1  2 
doc/packages-list.txt
make.sh

Simple merge
diff --cc make.sh
+++ b/make.sh
@@@ -574,8 -578,11 +578,11 @@@ buildipfire() 
    ipfiremake squidclamav
    ipfiremake bc
    ipfiremake esniper
- }
 +  ipfiremake mod_perl
 -  ipfiremake hostapd
 -}
+   ipfiremake vnstat
+   ipfiremake vnstati
+   ipfiremake wpa_supplicant
++  ipfiremake hostapd}
  
  buildinstaller() {
    # Run installer scripts one by one