Merge branch 'adam' into devel
authorAdam Liwo <jal47@matrix.chem.cornell.edu>
Wed, 17 Oct 2012 04:52:06 +0000 (00:52 -0400)
committerAdam Liwo <jal47@matrix.chem.cornell.edu>
Wed, 17 Oct 2012 04:52:06 +0000 (00:52 -0400)
commit9b6330314fdc1d218016e5e9017f1670275d05ca
tree31efa3e62081f07e8afa6ab3d1d4a10f83696da7
parent9599888d279b89c6e0ed41d57caf7160fc54f9e3
parente35b804370a6a557a65f6426600850b530c33bd9
Merge branch 'adam' into devel

Conflicts:
bin/unres/CSA/unres_csa_ifort_mpich-1.2.7p1.exe