From: Bartlomiej Zaborowski Date: Wed, 8 Aug 2012 10:25:53 +0000 (+0200) Subject: CASP3 force field deleted. Fixed merge conflicts. X-Git-Tag: v.3.2~69^2~8 X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=c6e5cc1ecf0804cd5d7fe0f5d4d9ba18aee74e30 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 --- c6e5cc1ecf0804cd5d7fe0f5d4d9ba18aee74e30