From: Adam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Date: Thu, 6 Aug 2015 08:39:41 +0000 (+0200)
Subject: Merge branch 'devel' into AFM
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=833a316033dd117cdeafab0decaf3da2a0b83eb4;hp=833a316033dd117cdeafab0decaf3da2a0b83eb4;p=unres.git

Merge branch 'devel' into AFM

Conflicts:
	.gitignore
	PARAM/pot_theta_G631_DIL.parm
	bin/unres/MD/unres-mult-symetr_ifort_MPICH_E0LL2Y.exe
	bin/unres/MD/unres_Tc_procor_oldparm_em64-D-symetr.exe
	bin/unres/MD/unres_ifort_MPICH_GAB.exe
	bin/xdrf2ang
	bin/xdrf2pdb
	bin/xdrf2pdb-m
	source/cluster/wham/src-M/energy_p_new.F
	source/maxlik/src_CSA/CMakeLists.txt
	source/unres/src_CSA_DiL/CMakeLists.txt
	source/unres/src_CSA_DiL/Makefile
	source/unres/src_CSA_DiL/csa.F
	source/unres/src_MD-M/COMMON.CONTROL
	source/unres/src_MD-M/DIMENSIONS
	source/unres/src_MD-M/Makefile
	source/unres/src_MD-M/cinfo.f
	source/unres/src_MD-M/energy_p_new_barrier.F
	source/unres/src_MD-M/parmread.F
	source/unres/src_MD-M/refsys.f
	source/unres/src_MD/COMMON.TORSION
	source/wham/src-M/DIMENSIONS
	source/wham/src-M/energy_p_new.F
	source/wham/src-M/readrtns.F
	source/xdrfpdb/src/Makefile
---