]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07ca0d9 dbe2ef8)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Oct 2008 17:54:31 +0000 (19:54 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Oct 2008 17:54:31 +0000 (19:54 +0200)
1  2 
config/rootfiles/updater/update.sh patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/updater/update.sh
Simple merge
IPFire 2.x development tree