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>
Wed, 3 Oct 2012 14:06:54 +0000 (16:06 +0200)
commitabb8046503fd7ebf6a2df6d399fa4dbb1f5ad056
treeb5fd91c6f4f8210b9e155c4ef5e55304d368b887
parent568d9324b9978c268e2e4396a7c0b7a8dae2c893
1. Fixed merge conflicts
2. Fixed CMake files
CMakeLists.txt
source/unres/src_CSA_DiL/CMakeLists.txt
source/unres/src_CSA_DiL/parmread.F