]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 927eb20 7829d1d)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 19 Aug 2010 12:49:57 +0000 (14:49 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 19 Aug 2010 12:49:57 +0000 (14:49 +0200)
Conflicts:
config/rootfiles/core/40/filelists/files
config/rootfiles/core/40/update.sh

1  2 
doc/packages-list.txt patch | diff1 | diff2 | blob | history

diff --cc doc/packages-list.txt
Simple merge
Timo's tree of IPFire 2.x