projects / unres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74eba75 b0b9ebc)
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)
Merge branch 'devel' of mmka:unres into devel

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


Trivial merge
UNRESPACK 3.x