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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 17 2016, 12:17.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 17 2016, 12:17

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
6cb38b17d88a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15185 f3b2605a-c512-4ea7…	Jun 16 2016
a3df07b9fc6c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15184 f3b2605a-c512-4ea7…	Jun 16 2016
6ba266492135	sjplimp	new orient/bcc for pull request #95	Jun 16 2016
8330ef7f7e2e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15182 f3b2605a-c512-4ea7…	Jun 16 2016
328224a2985c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15181 f3b2605a-c512-4ea7…	Jun 16 2016

				Path
	M			doc/html/Section_commands.html
	M			doc/html/_sources/Section_commands.txt
	M			doc/html/_sources/fix.txt
	V			doc/html/_sources/{fix_orient.txt ← fix_orient_fcc.txt}
	V			doc/html/_sources/{fix_orient_fcc.txt → fix_orient.txt}
	M			doc/html/_sources/kspace_modify.txt
	M			doc/html/_sources/read_data.txt
	M			doc/html/_sources/read_restart.txt
	M			doc/html/fix.html
	V			doc/html/{fix_orient.html ← fix_orient_fcc.html}
	V			doc/html/{fix_orient_fcc.html → fix_orient.html}
	M			doc/html/genindex.html
	M			doc/html/kspace_modify.html
	M			doc/html/read_data.html
	M			doc/html/read_restart.html
	M			doc/html/searchindex.js
	M			doc/src/Section_commands.txt
	M			doc/src/fix.txt
	V			doc/src/{fix_orient.txt ← fix_orient_fcc.txt}
	V			doc/src/{fix_orient_fcc.txt → fix_orient.txt}
	M			doc/src/kspace_modify.txt
	M			doc/src/read_data.txt
	M			doc/src/read_restart.txt
	M			src/atom.cpp