From: Adam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Date: Wed, 17 Dec 2014 09:48:55 +0000 (+0100)
Subject: Merge branch 'master' of mmka:unres
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=78c6b598700d2c701af6532afb20ebc905a0b8ef;hp=78c6b598700d2c701af6532afb20ebc905a0b8ef;p=unres.git

Merge branch 'master' of mmka:unres

Conflicts:
	.gitignore
	bin/cluster/unres_clustMD-mult_MPICH-GAB.exe
	bin/unres/MD/unres_gfortran_single_GAB.exe
	bin/unres/MD/unres_ifort_single_GAB.exe
	bin/unres/MINIM/unres_ifort_MIN_single_E0LL2Y.exe
	bin/unres/MINIM/unres_ifort_MIN_single_GAB.exe
	bin/unres_clustMD_MPI-oldparm
	bin/wham/wham_multparm-ham_rep-oldparm
	source/cluster/wham/src/COMMON.SCCOR
	source/cluster/wham/src/Makefile
	source/unres/src_MD-M/Makefile
	source/unres/src_MD-M/energy_p_new_barrier.F
	source/unres/src_MD-M/stochfric.F
	source/unres/src_MD/cinfo.f
	source/wham/src-M/Makefile
	source/wham/src/DIMENSIONS.FREE
---