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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 4 2016, 12:56.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 4 2016, 12:56

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
677da2ea52d9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15432 f3b2605a-c512-4ea7…	Aug 3 2016
a93e6e83ed58	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15431 f3b2605a-c512-4ea7…	Aug 3 2016
efaa84a4eab8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15430 f3b2605a-c512-4ea7…	Aug 3 2016
1f6518400e83	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15429 f3b2605a-c512-4ea7…	Aug 3 2016
be6c086cb4c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15428 f3b2605a-c512-4ea7…	Aug 3 2016
a6ade15e60bb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15427 f3b2605a-c512-4ea7…	Aug 3 2016
38226b808685	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15426 f3b2605a-c512-4ea7…	Aug 3 2016

				Path
	M			doc/html/Manual.html
	M			doc/html/_sources/Manual.txt
	M			doc/html/_sources/dump_modify.txt
	M			doc/html/_sources/thermo_modify.txt
	M			doc/html/dump_modify.html
	M			doc/html/searchindex.js
	M			doc/html/thermo_modify.html
	M			doc/src/Manual.txt
	M			doc/src/dump_modify.txt
	M			doc/src/thermo_modify.txt
	M			src/MPIIO/dump_atom_mpiio.cpp
	M			src/MPIIO/dump_custom_mpiio.cpp
	M			src/MPIIO/dump_xyz_mpiio.cpp
	M			src/dump.cpp
	M			src/dump.h
	M			src/dump_atom.cpp
	M			src/dump_custom.cpp
	M			src/dump_local.cpp
	M			src/dump_xyz.cpp
	M			src/thermo.cpp
	M			src/thermo.h
	M			src/version.h