Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/compat-wireless
	config/rootfiles/core/40/filelists/files
	doc/packages-list.txt
This commit is contained in:
Arne Fitzenreiter
2010-08-11 18:08:51 +02:00
12 changed files with 2008 additions and 2099 deletions

View File

@@ -68,6 +68,7 @@
* cmake-2.4.8
* collectd-4.9.1
* compat-wireless-2.6.34.1-kmod-2.6.32.17-ipfire
* compat-wireless-2.6.35-1-kmod-2.6.32.17-ipfire
* coreutils-5.96
* cpio-2.11
* cpufrequtils-007