Merge branch 'prerelease-3.2.1' into devel
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Tue, 19 Feb 2013 00:50:42 +0000 (01:50 +0100)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Tue, 19 Feb 2013 00:50:42 +0000 (01:50 +0100)
commit1606e1ed3e01fa02529bc9121a2583e4328ff69b
tree5ef8f5840b908ace558651455331baa1773b18e0
parent0b2500410688a3a6b769c7c1f00a7dc2ca662817
parenta6e6af07574daa32261a30956c0f5b1c42d317fd
Merge branch 'prerelease-3.2.1' into devel

Conflicts:
bin/unres/CSA/unres_csa_ifort_mpich-1.2.7p1.exe
bin/unres/MD/unres_gfortran_single_GAB.exe
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
bin/unres/MD/unres_ifort_single_GAB.exe
bin/unres/MINIM/unres_ifort_MIN_single_E0LL2Y.exe
source/unres/src_CSA/Makefile
source/unres/src_CSA_DiL/refsys.f
source/unres/src_MD-M/Makefile
source/unres/src_MD/parmread.F
source/unres/src_MD_DFA/COMMON.REFSYS
bin/unres/MD/unres_gfortran_single_GAB.exe
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
bin/unres/MD/unres_ifort_single_GAB.exe
bin/unres/MINIM/unres_ifort_MIN_single_E0LL2Y.exe
source/unres/src_CSA_DiL/refsys.f
source/unres/src_MIN/CMakeLists.txt