From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Dec 2011 23:41:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=226ae85e8bd1735403a9817fafc8ffbed848b4ea;p=ipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	gcc/gcc.nm
---

226ae85e8bd1735403a9817fafc8ffbed848b4ea
diff --cc gcc/gcc.nm
index 6bafedef5,c650b7194..7ec6485e4
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@@ -8,7 -8,7 +8,7 @@@ build_cloog_ppl = 
  
  name       = gcc
  version    = 4.6.2
- release    = 5
 -release    = 6
++release    = 7
  
  maintainer = Michael Tremer <michael.tremer@ipfire.org>
  groups     = Development/Compilers