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)
commit8f4ff43aff8e7c88469519e17fcd9f1d5ef73103
tree31efa3e62081f07e8afa6ab3d1d4a10f83696da7
parentc31fc30c9830b0e505fc4c5af6d07e13be4f3078
parentcad0dccfa3f4cb17a68291e88eec595015d42822
Merge branch 'adam' into devel

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