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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 31 2013, 12:38.

Description

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

Resolved Conflicts:
doc/Manual.txt

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 31 2013, 12:38

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPScb88752caad1: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 31 2013, 12:38

Commit	Author	Details	Committed
f2891f313d75	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10705 f3b2605a-c512-4ea7…	Aug 31 2013
006f280b669d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10704 f3b2605a-c512-4ea7…	Aug 31 2013
e94f08858e3b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10703 f3b2605a-c512-4ea7…	Aug 31 2013
320342718264	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10702 f3b2605a-c512-4ea7…	Aug 31 2013
799e759d79ed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10701 f3b2605a-c512-4ea7…	Aug 31 2013
270d94c5ef77	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10700 f3b2605a-c512-4ea7…	Aug 31 2013
afd85b293421	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10698 f3b2605a-c512-4ea7…	Aug 30 2013
b0501ad7c7f8	athomps	Added caveat to use of RDF for non-uniform systems	Aug 30 2013

				Path
	A			doc/Eqs/pair_nm.jpg
	A			doc/Eqs/pair_nm.tex
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/compute_rdf.html
	M			doc/compute_rdf.txt
	A			doc/pair_nm.html
	A			doc/pair_nm.txt
	P			src/MISC/pair_nm_cut.cpp Copied from src/CLASS2/pair_lj_class2.cpp
	P			src/MISC/pair_nm_cut.h Copied from src/USER-MISC/pair_lj_sf.h
	P			src/MISC/pair_nm_cut_coul_cut.cpp Copied from src/pair_lj_cut_coul_cut.cpp
	P			src/MISC/pair_nm_cut_coul_cut.h Copied from src/CLASS2/pair_lj_class2_coul_cut.h
	P			src/MISC/pair_nm_cut_coul_long.cpp Copied from src/KSPACE/pair_buck_coul_long.cpp
	P			src/MISC/pair_nm_cut_coul_long.h Copied from src/CLASS2/pair_lj_class2_coul_long.h
	M			src/version.h