Merge branch 'master' of mmka.chem.univ.gda.pl:unres into homology
authorFelipe Pineda <pideca@hotmail.com>
Wed, 25 Feb 2015 11:41:44 +0000 (12:41 +0100)
committerFelipe Pineda <pideca@hotmail.com>
Wed, 25 Feb 2015 11:41:44 +0000 (12:41 +0100)
commit4efe681fd37fcae5abd465271e6f6e64729a6731
tree1c7842234de41020252610f4e6dfa475e944b69a
parent975ac9d0e487c8158844030a1f009da2ef9f579a
parentc2f6a80d9d4a20631c9f9abed0a3ac4a36e59fab
Merge branch 'master' of mmka.chem.univ.gda.pl:unres into homology

Conflicts:
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/unres/src_MD/MREMD.F
source/unres/src_MD/cinfo.f
.gitignore
source/unres/src_MD/CMakeLists.txt
source/unres/src_MD/COMMON.SCCOR
source/unres/src_MD/MREMD.F
source/unres/src_MD/Makefile_MPICH_ifort
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F