git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit

]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit

projects / people / pmueller / ipfire-2.x.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6cf9e77 9f3e557)

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 11 Aug 2010 16:08:51 +0000 (18:08 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 11 Aug 2010 16:08:51 +0000 (18:08 +0200)
commit	99555458ad1defb46fa59fb7a7f7ce52001d0ff4
tree	62d6954893497adb754c98613e8a7fa44e51fd54	tree \| snapshot
parent	6cf9e77034bd4b27932e806a70e9b6985216a913	commit \| diff
parent	9f3e557b55cb8c8fd62cffad457eb346492a79fd	commit \| diff

Merge branch 'master' into next

Conflicts:
config/rootfiles/core/40/filelists/compat-wireless
config/rootfiles/core/40/filelists/files
doc/packages-list.txt

config/kernel/kernel.config.i586-ipfire	diff1 \|	diff2 \|	blob \| history
config/rootfiles/core/40/exclude	blob1 \|	blob2 \|	history
config/rootfiles/core/40/filelists/files	blob1 \|	blob2 \|	history
config/rootfiles/core/40/filelists/python	blob1 \|	blob2 \|	history
config/rootfiles/core/40/meta	blob1 \|	blob2 \|	history
config/rootfiles/core/40/update.sh	blob1 \|	blob2 \|	history
doc/packages-list.txt	diff1 \|	diff2 \|	blob \| history

Peter's tree of IPFire 2.x