Merge branch 'adam' into devel
authorAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 5 Jul 2012 10:19:09 +0000 (06:19 -0400)
committerAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 5 Jul 2012 10:19:09 +0000 (06:19 -0400)
commit773d612babe20d91120d2991cf33e3350f139400
tree158fa897c64c17346a15e2a0f2946814a83cc241
parent6dcbf45abd9b592edd85cfc40c9e31916b6f017a
parentbd3dab23a3d17f6b03fb043dbbe1c6fd8e3a3431
Merge branch 'adam' into devel

Conflicts:
source/unres/src_MD/Makefile_MPICH_ifort