mmka.chem.univ.gda.pl Git - unres.git/commit

author	Adam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
	Tue, 17 Jul 2012 08:40:16 +0000 (04:40 -0400)
committer	Adam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
	Tue, 17 Jul 2012 08:40:16 +0000 (04:40 -0400)
commit	ca784a0624157f2a77b80ee7bcff288444176044
tree	d9821d08d3aacb4b271d162c907971fdb784dd94	tree \| snapshot
parent	dea109d5d6a9c95e03e4791bf38e04d1c8dad450	commit \| diff
parent	93772c7c1a019e9391940930dbd21052ce038b49	commit \| diff

Merge branch 'adasko' into devel

Dzialajacy D i L aminokwasy dla src_MD
Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
bin/wham/wham_multparm-ham_rep-oldparm
source/unres/src_MD/Makefile
source/unres/src_MD/Makefile_MPICH_ifort
source/unres/src_MD/cinfo.f
source/wham/src/Makefile
source/wham/src/cinfo.f

UNRESPACK 3.x

RSS Atom

.gitignore	diff1 \|	diff2 \|	blob \| history
bin/unres/MD/unres_ifort_MPICH_GAB.exe	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/Makefile	\|	diff2 \|	blob \| history
source/unres/src_MD/cinfo.f	\|	diff2 \|	blob \| history
source/wham/src/energy_p_new.F	diff1 \|	diff2 \|	blob \| history