Merge branch 'bartek2' into bartek
authorBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Tue, 2 Oct 2012 15:51:07 +0000 (17:51 +0200)
committerBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Tue, 2 Oct 2012 15:51:07 +0000 (17:51 +0200)
commit81513f4efcd95dcfc5d3ec05ce6396a392d8ac24
treee627316a10b4789b48521a86afb266cebe800504
parent03f945f08803ac33d94abb35d001684a49080647
parent59403741e5c6541c3617c08c6e8e0c11ec394cce
Merge branch 'bartek2' into bartek

Conflicts:
source/unres/src_CSA_DiL/energy_p_new_barrier.F
source/unres/src_CSA_DiL/parmread.F
source/unres/src_CSA_DiL/COMMON.LOCAL
source/unres/src_CSA_DiL/energy_p_new_barrier.F
source/unres/src_CSA_DiL/gen_rand_conf.F
source/unres/src_CSA_DiL/initialize_p.F
source/unres/src_CSA_DiL/parmread.F
source/unres/src_CSA_DiL/readrtns_csa.F