Merge branch 'prerelease-3.2.1' into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Wed, 5 Nov 2014 22:44:32 +0000 (23:44 +0100)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Wed, 5 Nov 2014 22:44:32 +0000 (23:44 +0100)
commit0574a4aadafa8a9357deb13d698ac66931fc06ff
treec6ae076f19acfc62ecd4be9dd323570ad0ea03df
parent5f331e648636da48baee4467989f411fb3d8af24
parent8f2aef346c425b9a9d9a768931954134dabd64ae
Merge branch 'prerelease-3.2.1' into devel

Conflicts:
.gitignore
CMakeLists.txt
source/cluster/wham/src/COMMON.SCCOR
source/maxlik/src_CSA/CMakeLists.txt
source/unres/src_CSA_DiL/CMakeLists.txt
source/unres/src_MD-M/CMakeLists.txt
source/unres/src_MD-M/Makefile
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/ssMD.F
source/unres/src_MD/CMakeLists.txt
source/unres/src_MIN/CMakeLists.txt
source/wham/src/DIMENSIONS.FREE
source/xdrfpdb/src/CMakeLists.txt
13 files changed:
CMakeLists.txt
source/maxlik/src_CSA/CMakeLists.txt
source/unres/src_MD-M/CMakeLists.txt
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/readrtns_CSA.F
source/unres/src_MD/CMakeLists.txt
source/unres/src_MD/COMMON.SCCOR
source/unres/src_MD/energy_p_new_barrier.F
source/unres/src_MIN/CMakeLists.txt
source/wham/src-M/CMakeLists.txt
source/wham/src/CMakeLists.txt
source/wham/src/energy_p_new.F
source/xdrfpdb/src/CMakeLists.txt