]> 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: dc5ff2f 722f0f7)
Merge branch 'x-fixes' into ms-no-toolchain
authorSchantl Stefan <Stevee@ipfire.org>
Sat, 11 Sep 2010 18:09:17 +0000 (20:09 +0200)
committerSchantl Stefan <Stevee@ipfire.org>
Sat, 11 Sep 2010 18:09:17 +0000 (20:09 +0200)
Conflicts:
tools/quality-agent.d/050-relro

1  2 
pkgs/Constants patch | diff1 | diff2 | blob | history
tools/quality-agent.d/050-relro patch | diff1 | diff2 | blob | history

diff --cc pkgs/Constants
Simple merge
diff --cc tools/quality-agent.d/050-relro
Simple merge
IPFire 3.x development tree