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