CASP3 force field deleted. Fixed merge conflicts.
authorBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Wed, 8 Aug 2012 10:25:53 +0000 (12:25 +0200)
committerBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Wed, 8 Aug 2012 10:25:53 +0000 (12:25 +0200)
commitba82278a2043068b8b05c26ef18a9c6bf24ff0be
tree15249be70b8778f2135132a79c812aa57041efd9
parent74eba75e0ea7f72de3ce05a4662fe1c029da0592
parent64178f43ccff84c16fc5513a1dfbd1aa3a44ecf2
CASP3 force field deleted. Fixed merge conflicts.

Merge branch 'devel' of mmka:unres into devel

Conflicts:
.gitignore
examples/unres/CSA/CASP3/ENERGY/unres_casp3.csh
source/unres/src_CSA/Makefile