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)
commit20fc725f08ab51134f254a7d07cc6577246bca76
treef8f24580871e34e61afbd34d9aee7a4f42173258
parent5427b5453afa2d2c05c06f6f8c7737cb76c79861
parent5f34e20e1192b0f3cb58130e7222a41a9ba88744
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