Diffusion lammps fa036de2993d

Merge remote branch 'lammps-ro/master' into lammps-icms
fa036de2993d
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 6 2013, 13:52.

Description

Merge remote branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 6 2013, 13:52

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS767784895d26: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10983 f3b2605a-c512-4ea7…
rLAMMPS4900a9922891: recover adjustment to altered FFT3d API

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSfa036de2993d: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 6 2013, 13:52

Merged Changes

Commit	Author	Details	Committed
767784895d26	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10983 f3b2605a-c512-4ea7…	Nov 5 2013
c44a7a267340	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10982 f3b2605a-c512-4ea7…	Nov 5 2013
c90a68646c56	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10980 f3b2605a-c512-4ea7…	Nov 5 2013
91913c8b8dde	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10979 f3b2605a-c512-4ea7…	Nov 5 2013
51331821987d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10978 f3b2605a-c512-4ea7…	Nov 5 2013
9f6f931565fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10977 f3b2605a-c512-4ea7…	Nov 5 2013
7f04aae7ed62	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10975 f3b2605a-c512-4ea7…	Nov 5 2013
3cbbe1490247	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10974 f3b2605a-c512-4ea7…	Nov 5 2013
b1b39a15c460	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10973 f3b2605a-c512-4ea7…	Nov 5 2013
772af4afd00f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10972 f3b2605a-c512-4ea7…	Nov 5 2013
5725a9cfd8be	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10971 f3b2605a-c512-4ea7…	Nov 5 2013
0a6129594435	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10970 f3b2605a-c512-4ea7…	Nov 5 2013
7e26c6085fce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10969 f3b2605a-c512-4ea7…	Nov 5 2013
4d4698f0998b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10968 f3b2605a-c512-4ea7…	Nov 5 2013
b927375ca421	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10967 f3b2605a-c512-4ea7…	Nov 5 2013
3237d21989d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10966 f3b2605a-c512-4ea7…	Nov 5 2013

Changes (21)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/compute_msd.html
	M			doc/compute_msd.txt
	M			doc/fix_append_atoms.html
	M			doc/fix_append_atoms.txt
	M			doc/write_dump.html
	M			doc/write_dump.txt
	M			src/USER-REAXC/reaxc_control.cpp
	M			src/atom.cpp
	A			src/compute_vacf.cpp
	P			src/compute_vacf.h Copied from src/compute_msd.h
	M			src/dump_image.cpp
	M			src/dump_image.h
	M			src/neigh_list.cpp
	M			src/neighbor.cpp
	M			src/variable.cpp
	M			src/version.h
	M			src/write_dump.cpp