Merge branch 'devel' into bartek. Fixed conflicts in paramread.F and CMakeLists.txt
authorBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Wed, 10 Oct 2012 13:00:19 +0000 (15:00 +0200)
committerBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Wed, 10 Oct 2012 13:00:19 +0000 (15:00 +0200)
commit7a848636545a1e53628bbfa4b794de1f24718e02
treed22e8e1079cb6a38c2c0c0348a6b5d95c4bf5781
parentc8e86e284ec81b749959b45585fbb0eba03a1f61
parent39d8ca8a4d40da8e755ff7a42e2f44862a4c460c
Merge branch 'devel' into bartek. Fixed conflicts in paramread.F and CMakeLists.txt

Conflicts:
source/unres/src_CSA_DiL/CMakeLists.txt
source/unres/src_CSA_DiL/parmread.F