]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09560bd 7eaea6f)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 27 Dec 2010 00:26:24 +0000 (01:26 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 27 Dec 2010 00:26:24 +0000 (01:26 +0100)
Conflicts:
pkgs/core/kernel/config

1  2 
pkgs/core/kernel/config patch | diff1 | diff2 | blob | history

diff --cc pkgs/core/kernel/config
Simple merge
IPFire 3.x development tree