Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
authorAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 10 Apr 2014 19:57:52 +0000 (15:57 -0400)
committerAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 10 Apr 2014 19:57:52 +0000 (15:57 -0400)
commit007e53219477b759888ad8908451f179d61e9738
tree232dbc6d73538b6e38d796c72f1a083729677db5
parentc6c33e0851d342885c1a5bb0d5bcde5c1aea8d56
parentcaf0eb98cd370f594b1990530fe14e0e823988c6
Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel

Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/unres/src_MD-M/initialize_p.F
source/unres/src_MD/initialize_p.F