]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Dec 2011 23:41:19 +0000 (00:41 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Dec 2011 23:41:19 +0000 (00:41 +0100)
commit226ae85e8bd1735403a9817fafc8ffbed848b4ea
treef65cb85214e18f7d75286e160338c09a525a5de9
parentf2ed7b80d95dce61cbece32dd3096b9de7aa1e2f
parent133191284063ceedbb37ccb6e904675362038392
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
gcc/gcc.nm
gcc/gcc.nm