]> git.ipfire.org Git - ipfire-3.x.git/commit
projects / ipfire-3.x.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 646e91b 272fe58)
Merge branch 'x-fixes' into ms-no-toolchain
authorSchantl Stefan <Stevee@ipfire.org>
Sat, 4 Sep 2010 14:26:32 +0000 (16:26 +0200)
committerSchantl Stefan <Stevee@ipfire.org>
Sat, 4 Sep 2010 14:26:32 +0000 (16:26 +0200)
commite2880daea1fbc0a4a564cd3be3fe0ebd8bd90fc7
tree17cf07798790bdb39eee5b2929e2213edaa59015tree | snapshot
parent646e91b62278fe3da495dc16d06d1ce967d37094commit | diff
parent272fe5894a1a8e125e01def310f32f6b49443faecommit | diff
Merge branch 'x-fixes' into ms-no-toolchain

Conflicts:
pkgs/core/gcc/gcc.nm
pkgs/core/libassuan/libassuan.nm
pkgs/toolchain/gcc-static/gcc-static.nm
pkgs/toolchain/gcc/gcc.nm
19 files changed:
pkgs/core/autoconf/autoconf.nm diff1 | diff2 | blob | history
pkgs/core/bison/bison.nm diff1 | diff2 | blob | history
pkgs/core/cmake/cmake.nm diff1 | diff2 | blob | history
pkgs/core/curl/curl.nm diff1 | diff2 | blob | history
pkgs/core/dbus/dbus.nm diff1 | diff2 | blob | history
pkgs/core/fontconfig/fontconfig.nm diff1 | diff2 | blob | history
pkgs/core/gcc/gcc.nm diff1 | diff2 | blob | history
pkgs/core/glibc/glibc.nm diff1 | diff2 | blob | history
pkgs/core/iptables/iptables.nm diff1 | diff2 | blob | history
pkgs/core/libassuan/libassuan.nm diff1 | diff2 | blob | history
pkgs/core/libgcrypt/libgcrypt.nm diff1 | diff2 | blob | history
pkgs/core/libgpg-error/libgpg-error.nm diff1 | diff2 | blob | history
pkgs/core/libksba/libksba.nm diff1 | diff2 | blob | history
pkgs/core/libssh2/libssh2.nm diff1 | diff2 | blob | history
pkgs/core/pixman/pixman.nm diff1 | diff2 | blob | history
pkgs/core/python/python.nm diff1 | diff2 | blob | history
pkgs/core/sudo/sudo.nm diff1 | diff2 | blob | history
pkgs/core/syslinux/syslinux.nm diff1 | diff2 | blob | history
pkgs/core/vsftpd/vsftpd.nm diff1 | diff2 | blob | history
IPFire 3.x development tree