]> 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: e2880da cdb9873)
Merge branch 'no-toolchain' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x...
authorSchantl Stefan <Stevee@ipfire.org>
Thu, 9 Sep 2010 17:20:54 +0000 (19:20 +0200)
committerSchantl Stefan <Stevee@ipfire.org>
Thu, 9 Sep 2010 17:20:54 +0000 (19:20 +0200)
Conflicts:
pkgs/core/gcc/gcc.nm

1  2 
pkgs/core/gcc/gcc.nm patch | diff1 | diff2 | blob | history
pkgs/core/lighttpd/lighttpd.nm patch | diff1 | diff2 | blob | history

diff --cc pkgs/core/gcc/gcc.nm
Simple merge
diff --cc pkgs/core/lighttpd/lighttpd.nm
Simple merge
IPFire 3.x development tree