projects / unres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3411e58 d305e36)
Merge branch 'adasko' into devel
authorAdam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Wed, 27 Jun 2012 11:53:41 +0000 (07:53 -0400)
committerAdam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Wed, 27 Jun 2012 11:53:41 +0000 (07:53 -0400)
Conflicts:
.gitignore
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/cluster/wham/src/DIMENSIONS.COMPAR
source/cluster/wham/src/Makefile
source/wham/src/Makefile
source/wham/src/cinfo.f
source/wham/src/tmptmp

1  2 
source/cluster/wham/src/energy_p_new.F patch | diff1 | diff2 | blob | history
source/unres/src_MD/cinfo.f patch | diff1 | diff2 | blob | history
source/wham/src/energy_p_new.F patch | diff1 | diff2 | blob | history

diff --cc source/unres/src_MD/cinfo.f
Simple merge
diff --cc source/wham/src/energy_p_new.F
Simple merge
UNRESPACK 3.x