Merge branch 'devel' into bartek. Fixed conflicts in paramread.F and CMakeLists.txt
authorBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Wed, 10 Oct 2012 13:00:19 +0000 (15:00 +0200)
committerBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Wed, 10 Oct 2012 13:00:19 +0000 (15:00 +0200)
commitf4a749d9716cb6b70444d74eba7363e5e4856f42
treedfb44c1a7ae3bd0d9036d07ea6a1b46a5020e87a
parent8635adbf67a7c088e947a28775f769b561410091
parent79d307370f6f7523b7090730bcc4f9ea98fbdab0
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