projects
/
unres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4dfd5a3
2e911ab
)
Merge branch 'prerelease-3.2.1' into czarek
author
Cezary Czaplewski
<czarek@chem.univ.gda.pl>
Tue, 19 Feb 2013 00:10:29 +0000
(
01:10
+0100)
committer
Cezary Czaplewski
<czarek@chem.univ.gda.pl>
Tue, 19 Feb 2013 00:10:29 +0000
(
01:10
+0100)
Conflicts:
bin/unres/MD/unres_gfortran_single_GAB.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/unres/src_MD/cinfo.f
1
2
source/unres/src_MD/energy_p_new_barrier.F
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/unres/src_MD/energy_p_new_barrier.F
Simple merge
projects / unres.git / commitdiff