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)
commit8f7b1b10ee6012726aac0da9175fae3bc84a9497
tree7491f242ddef69607c9febbb6305963553657808
parentaa40279614f313ccfc4fc41dd028f8c3ac76d975
parent341fc7d1de8dc963d455124e9e0bb39023e16425
Merge branch 'feature-cmake' into devel
source/unres/src_CSA/energy_p_new_barrier.F