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)
commit158e923530fe6036ef48f63ed0cd34c56a39eee6
tree158fa897c64c17346a15e2a0f2946814a83cc241
parent8889f8be9b85751ccce8d13da6dae495175f2885
parented9648148cfa08bbdd499548965f982762cda932
Merge branch 'adam' into devel

Conflicts:
source/unres/src_MD/Makefile_MPICH_ifort