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

projects / unres.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c3d632c 66693b0)

author	Felipe Pineda <pideca@hotmail.com>
	Wed, 25 Feb 2015 11:41:44 +0000 (12:41 +0100)
committer	Felipe Pineda <pideca@hotmail.com>
	Wed, 25 Feb 2015 11:41:44 +0000 (12:41 +0100)
commit	c45f3ac598572d95b62213f9ed78f4990a8f7735
tree	fb970e6c0d2f15c3c8b846f089f5c685350c3b2f	tree \| snapshot
parent	c3d632cf84fd647434c093cb3fd69ea605293f75	commit \| diff
parent	66693b0684c228404e7aadcffe6d2a8c9f489063	commit \| diff

Merge branch 'master' of mmka.chem.univ.gda.pl:unres into homology

Conflicts:
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/unres/src_MD/MREMD.F
source/unres/src_MD/cinfo.f

.gitignore	diff1 \|	diff2 \|	blob \| history
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe	blob1 \|	blob2 \|	history
bin/unres/MD/unres_ifort_MPICH_E0LL2Y_2.exe	\|	\|	blob
source/unres/src_MD/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/COMMON.SCCOR	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/MREMD.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/Makefile_MPICH_ifort	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/cinfo.f	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/energy_p_new_barrier.F	diff1 \|	diff2 \|	blob \| history

UNRESPACK 3.x