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)
commitad14a2a75bd411d2ba28e29b8b84c4ad4656aa40
treee627316a10b4789b48521a86afb266cebe800504
parent65bc3c65a06a5aa9b5c4eb94c309dbe1105606f6
parent9260f16064f93b4c825f18bcf56a624fd5c495b5
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