Hans-Christian Stadler Kleeb 920bd15614 Merge branch 'master' of gitlab.psi.ch:Pmodules/buildblocks ...

Conflicts:
	Compiler/openmpi/1.10/variants.Linux

Added gcc/6.2.0

2016-09-07 11:26:45 +02:00

..

4

Programming/gcc/4/configure-as.patch

2016-07-27 18:52:46 +02:00

5

conflicts merged

2016-07-27 19:20:29 +02:00

6

Merge branch 'master' of gitlab.psi.ch:Pmodules/buildblocks

2016-09-07 11:26:45 +02:00

build

conflicts merged

2016-07-27 19:20:29 +02:00

modulefile

all buildblocks moved one level up

2015-10-14 18:20:36 +02:00