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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 31 2016, 12:54.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 31 2016, 12:54

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
6ff87be84925	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15413 f3b2605a-c512-4ea7…	Jul 30 2016
26622f2826fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15412 f3b2605a-c512-4ea7…	Jul 30 2016
7ec3c90b86b0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15411 f3b2605a-c512-4ea7…	Jul 30 2016
fd05571ee03e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15410 f3b2605a-c512-4ea7…	Jul 30 2016
5b5f839265b4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15409 f3b2605a-c512-4ea7…	Jul 30 2016
d3e47eef1cc1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15407 f3b2605a-c512-4ea7…	Jul 30 2016
f9c6ec768b49	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15406 f3b2605a-c512-4ea7…	Jul 30 2016
fb13763ef91d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15404 f3b2605a-c512-4ea7…	Jul 30 2016
22fe3fd17875	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15403 f3b2605a-c512-4ea7…	Jul 30 2016
58be921a0932	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15402 f3b2605a-c512-4ea7…	Jul 30 2016
b5836fa49170	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15401 f3b2605a-c512-4ea7…	Jul 30 2016
4eb6664ba8a2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15400 f3b2605a-c512-4ea7…	Jul 30 2016
ee86bd2463f0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15399 f3b2605a-c512-4ea7…	Jul 30 2016

				Path
	M			doc/Manual.pdf
	M			doc/html/Manual.html
	M			doc/html/_sources/Manual.txt
	M			doc/html/_sources/compute_rigid_local.txt
	M			doc/html/_sources/manifolds.txt
	M			doc/html/_sources/pair_modify.txt
	M			doc/html/_sources/tutorial_github.txt
	M			doc/html/compute_rigid_local.html
	M			doc/html/manifolds.html
	M			doc/html/pair_modify.html
	M			doc/html/searchindex.js
	M			doc/html/tutorial_github.html
	M			doc/lammps.book
	M			doc/src/Manual.txt
	M			doc/src/compute_rigid_local.txt
	M			doc/src/manifolds.txt
	M			doc/src/pair_modify.txt
	M			doc/src/tutorial_github.txt
	M			examples/nb3b/MOH.nb3b.harmonic
	M			potentials/MOH.nb3b.harmonic
	M			src/KSPACE/ewald_disp.cpp
	M			src/MANYBODY/pair_nb3b_harmonic.cpp
	M			src/USER-QMMM/fix_qmmm.cpp
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_histo_weight.cpp
	M			src/version.h