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)
commita40bd826ef8efa517c8f765c282365f3793f5811
treeb7f8d597b874f3125bee8d9693b07d3e5eb86910
parentf8ad83534ea93051b67c00eb1b4fa6a2c42e1d8a
parent644f82b51cff33590a9de2ca3cfc803456955ebe
Merge branch 'adam' into devel

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