projects
/
unres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
debd48e
f318062
)
Import fixed makefiles in cluster
author
Adam Liwo
<adam@piasek4.chem.univ.gda.pl>
Sun, 10 May 2015 02:44:22 +0000
(
04:44
+0200)
committer
Adam Liwo
<adam@piasek4.chem.univ.gda.pl>
Sun, 10 May 2015 02:44:22 +0000
(
04:44
+0200)
Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1
Conflicts:
source/cluster/wham/src-M/Makefile-MPICH-gfortran
source/cluster/wham/src-M/Makefile-MPICH-ifort
1
2
source/cluster/wham/src-M/Makefile-MPICH-ifort
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/cluster/wham/src-M/Makefile-MPICH-ifort
Simple merge