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)
commitc8e86e284ec81b749959b45585fbb0eba03a1f61
treefd1e3048c1747445d72d40da5cf3cd53cd110f39
parentc734f7a626db5ffe279e53c9a4a1c92dbb120f46
1. Fixed merge conflicts
2. Fixed CMake files
CMakeLists.txt
source/unres/src_CSA_DiL/CMakeLists.txt
source/unres/src_CSA_DiL/parmread.F