Merge branch 'devel' of mmka:unres into czarek
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Fri, 9 Nov 2012 09:15:36 +0000 (10:15 +0100)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Fri, 9 Nov 2012 09:15:36 +0000 (10:15 +0100)
commitc2f78e399d8319a61116e8cb9833cfc6fca9aeb3
treefaadb97bd67bb7341cd0f1e0230729f8377f5e91
parent3fc7e5eaa3b384501e4864c64ade3c92121fa283
parentc092a8655963478b90eb630150c75ff5775f45f0
Merge branch 'devel' of mmka:unres into czarek

Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
bin/unres/MD/unres_ifort_single_GAB.exe
source/unres/src_MD/parmread.F
bin/unres/MD/unres_ifort_MPICH_GAB.exe
bin/unres/MD/unres_ifort_single_GAB.exe
source/unres/src_MD/CMakeLists.txt
source/unres/src_MD/Makefile_single_ifort
source/unres/src_MD/energy_p_new_barrier.F
source/unres/src_MD/initialize_p.F
source/unres/src_MD/readrtns.F