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)
commitc6e5cc1ecf0804cd5d7fe0f5d4d9ba18aee74e30
tree15249be70b8778f2135132a79c812aa57041efd9
parent74eba75e0ea7f72de3ce05a4662fe1c029da0592
parentb0b9ebc44c9760d964bf33cc8c3a45b2e477be58
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