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)
commit4b4feff6a9618af7421db23c79e33d5be3470917
tree0b8d8c66d0cf94232af840beaf79cd7342058905
parent509c6e23b5321cb2ca1fa2b46a1fc95eb1c75a51
parentddaf3c773f857b9690066a5904bf5ae84a263cd2
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
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