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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 16 2014, 16:38.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 16 2014, 16:38

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
6af467aadb90	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11999 f3b2605a-c512-4ea7…	May 16 2014
bc3cd87496eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11998 f3b2605a-c512-4ea7…	May 15 2014
65e002094880	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11997 f3b2605a-c512-4ea7…	May 15 2014
db0cac35a296	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11996 f3b2605a-c512-4ea7…	May 15 2014
474a7279e252	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11995 f3b2605a-c512-4ea7…	May 15 2014
527b91492cee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11994 f3b2605a-c512-4ea7…	May 15 2014
bf8f07d85a78	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11993 f3b2605a-c512-4ea7…	May 15 2014

				Path
	M			doc/Section_modify.html
	M			doc/Section_modify.txt
	M			doc/compute_gyration.html
	M			doc/compute_gyration.txt
	M			doc/compute_gyration_molecule.html
	M			doc/compute_gyration_molecule.txt
	M			doc/delete_atoms.html
	M			doc/delete_atoms.txt
	M			doc/dump_image.html
	M			doc/dump_image.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			src/compute_gyration.cpp
	M			src/compute_gyration_molecule.cpp
	M			src/input.cpp
	M			src/variable.cpp
	M			src/variable.h
	D			tools/moltemplate/common/oplsaa/alternate_oplsaa_file
	D			tools/moltemplate/common/oplsaa/alternate_oplsaa_file/README_alternate_atom_numbers.txt
	D			tools/moltemplate/common/oplsaa/alternate_oplsaa_file/oplsaa.txt