From: Bartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Date: Wed, 10 Oct 2012 13:00:19 +0000 (+0200)
Subject: Merge branch 'devel' into bartek. Fixed conflicts in paramread.F and CMakeLists.txt
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=f4a749d9716cb6b70444d74eba7363e5e4856f42;p=unres.git

Merge branch 'devel' into bartek. Fixed conflicts in paramread.F and CMakeLists.txt

Conflicts:
	source/unres/src_CSA_DiL/CMakeLists.txt
	source/unres/src_CSA_DiL/parmread.F
---

f4a749d9716cb6b70444d74eba7363e5e4856f42