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)
commit715dd743e8e9985863b30940b432a0e466620ea9
tree92c790c4c7d69921b42299c08ce2e7f5989abb26
parent3411e580ed0ceb87f94f96ea3c189ee5b1034166
parentd305e36a373240ab73bff1add79dd6c63726082e
Merge branch 'adasko' into devel

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
source/cluster/wham/src/energy_p_new.F
source/unres/src_MD/cinfo.f
source/wham/src/energy_p_new.F