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)
commit8f91930f614f3948cdc76f24e62ee5afb898f349
tree0e0af25cc7d06280cd5a93531e3fdf5722b6bd78
parent4f8c4eafa5d9efecf8807b85484ba718ac0e7d0e
parent8e791d1f2939de50ac2077a30406052d5aaae400
Merge branch 'adam' into devel

Conflicts:
source/unres/src_MD/Makefile_MPICH_ifort