Diffusion lammps 6e327ee1b361

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
6e327ee1b361
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 2 2016, 23:38.

Description

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

Resolved Conflicts:

doc/Eqs/pair_morse_smooth_linear.jpg
doc/Manual.html
doc/Manual.txt
doc/pair_morse.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 2 2016, 23:38

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS9b33b0418323: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14720 f3b2605a-c512-4ea7…
rLAMMPS5ee04e33b1d5: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6e327ee1b361: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 2 2016, 23:38

Merged Changes

Commit	Author	Details	Committed
9b33b0418323	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14720 f3b2605a-c512-4ea7…	Mar 2 2016
e97ec23ed316	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14718 f3b2605a-c512-4ea7…	Mar 1 2016
19d769ac45f9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14716 f3b2605a-c512-4ea7…	Mar 1 2016
ef273d309551	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14715 f3b2605a-c512-4ea7…	Mar 1 2016
9e22165357c3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14714 f3b2605a-c512-4ea7…	Mar 1 2016
223defd6eee2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14713 f3b2605a-c512-4ea7…	Mar 1 2016
dd73c4c4c3c6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14712 f3b2605a-c512-4ea7…	Mar 1 2016
c67331a3bcce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14711 f3b2605a-c512-4ea7…	Mar 1 2016
1145d82222c4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14710 f3b2605a-c512-4ea7…	Mar 1 2016
9d64c50cd0aa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14709 f3b2605a-c512-4ea7…	Mar 1 2016
9dec6db5693f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14708 f3b2605a-c512-4ea7…	Mar 1 2016
29215e81163c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14707 f3b2605a-c512-4ea7…	Mar 1 2016
800c546e19b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14706 f3b2605a-c512-4ea7…	Mar 1 2016
45d25c6154f6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14705 f3b2605a-c512-4ea7…	Mar 1 2016
a3b0234a6a1b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14704 f3b2605a-c512-4ea7…	Mar 1 2016
20beaccf0f53	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14703 f3b2605a-c512-4ea7…	Mar 1 2016
6e2893c76858	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14702 f3b2605a-c512-4ea7…	Mar 1 2016
756480ba645f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14701 f3b2605a-c512-4ea7…	Mar 1 2016
d0646402bc39	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14700 f3b2605a-c512-4ea7…	Mar 1 2016
ee19043605a9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14699 f3b2605a-c512-4ea7…	Mar 1 2016
0bf65758e844	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14698 f3b2605a-c512-4ea7…	Mar 1 2016
7642bc177506	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14697 f3b2605a-c512-4ea7…	Mar 1 2016
d1a65e5f6a68	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14696 f3b2605a-c512-4ea7…	Mar 1 2016
23ab6d4c0c48	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14695 f3b2605a-c512-4ea7…	Mar 1 2016

Changes (47)

				Path
	M			doc/Eqs/pair_morse_smooth_linear.jpg
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	A			doc/_images/pair_morse_smooth_linear.jpg
	M			doc/_sources/Manual.txt
	M			doc/_sources/Section_commands.txt
	M			doc/_sources/Section_howto.txt
	M			doc/_sources/compute_slice.txt
	M			doc/_sources/fix_ave_correlate.txt
	M			doc/_sources/fix_ave_histo.txt
	M			doc/_sources/fix_ave_time.txt
	M			doc/_sources/fix_vector.txt
	M			doc/_sources/pair_morse.txt
	M			doc/_sources/thermo_style.txt
	M			doc/_sources/variable.txt
	M			doc/compute_slice.html
	M			doc/compute_slice.txt
	M			doc/fix_ave_correlate.html
	M			doc/fix_ave_correlate.txt
	M			doc/fix_ave_histo.html
	M			doc/fix_ave_histo.txt
	M			doc/fix_ave_time.html
	M			doc/fix_ave_time.txt
	M			doc/fix_vector.html
	M			doc/fix_vector.txt
	M			doc/pair_morse.html
	M			doc/pair_morse.txt
	M			doc/searchindex.js
	M			doc/thermo_style.html
	M			doc/thermo_style.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			src/comm_brick.cpp
	M			src/compute_slice.cpp
	M			src/domain.cpp
	M			src/fix_ave_correlate.cpp
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_time.cpp
	M			src/fix_vector.cpp
	M			src/thermo.cpp
	M			src/variable.cpp
	M			src/variable.h
	M			src/version.h