1. Fixed merge conflicts
authorBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Wed, 3 Oct 2012 14:06:54 +0000 (16:06 +0200)
committerBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Tue, 9 Oct 2012 14:11:39 +0000 (16:11 +0200)
commit8635adbf67a7c088e947a28775f769b561410091
treebc8f8b05066a0e740554e7f08507b2e915bb5429
parente97eaa3ffac31a1e6959a54e08e8575ac3c12db2
1. Fixed merge conflicts
2. Fixed CMake files
CMakeLists.txt
source/unres/src_CSA_DiL/CMakeLists.txt
source/unres/src_CSA_DiL/parmread.F