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)
commit17a5630bf6e2a69f42b7407eb4c7d3eed9e671ec
treef8f24580871e34e61afbd34d9aee7a4f42173258
parent8aa18b3787e233ce95e1003cf2a4e6c169f9a15c
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