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