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)
commit372664d7bf52ad486c87a2e82f4e622488c95819
tree40fdf0655bc8eab32319352a6164d150e2f79e77
parente1875243c19bf5619307292bcc79a50e81c1b044
parent5d46da5f86e652d540ced232983c47bb712dda0f
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