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)
commit7abffad82f67ce33e3308324a4085e88b2880e62
tree0e0af25cc7d06280cd5a93531e3fdf5722b6bd78
parentbd72b3c7ba94afc7170946f63180e7b7357a622d
parentb9bde6cf7bb36a61e13344db416f743f7cb90059
Merge branch 'adam' into devel

Conflicts:
source/unres/src_MD/Makefile_MPICH_ifort