Merge branch 'feature-cmake' into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Fri, 18 May 2012 11:13:14 +0000 (13:13 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Fri, 18 May 2012 11:13:14 +0000 (13:13 +0200)
commit5748cbbce5967bc99ce16ac1c862b261a5478280
tree38a38a214fe082255e018776207992de561998be
parente6be6f3432696603440b91ad5a5732214f003264
parent5d3ddac6dac9a886e7d58891564e0495be9f7fe8
Merge branch 'feature-cmake' into devel
source/unres/src_CSA/energy_p_new_barrier.F