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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 19 2013, 13:54.

Description

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

Resolved Conflicts:
doc/Manual.txt

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 19 2013, 13:54

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS68c0de719973: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 19 2013, 13:54

Commit	Author	Details	Committed
e7972a647224	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10814 f3b2605a-c512-4ea7…	Sep 18 2013
f8fe148cf48b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10813 f3b2605a-c512-4ea7…	Sep 18 2013
710cc581da87	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10812 f3b2605a-c512-4ea7…	Sep 18 2013
6a189f3188ae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10811 f3b2605a-c512-4ea7…	Sep 18 2013
7a583cef4936	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10809 f3b2605a-c512-4ea7…	Sep 18 2013
505313c828ed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10808 f3b2605a-c512-4ea7…	Sep 18 2013
d28e92e032b5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10806 f3b2605a-c512-4ea7…	Sep 18 2013
23da8399c0b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10805 f3b2605a-c512-4ea7…	Sep 18 2013
0680636555a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10804 f3b2605a-c512-4ea7…	Sep 18 2013

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/read_dump.html
	M			doc/read_dump.txt
	M			src/MANYBODY/pair_tersoff_mod.h
	M			src/USER-MOLFILE/reader_molfile.cpp
	M			src/USER-MOLFILE/reader_molfile.h
	M			src/fix.cpp
	M			src/fix_ave_correlate.cpp
	M			src/fix_ave_spatial.cpp
	M			src/fix_ave_time.cpp
	M			src/pair_zbl.cpp
	M			src/read_dump.cpp
	M			src/read_dump.h
	M			src/reader.h
	M			src/reader_native.cpp
	M			src/reader_native.h
	M			src/reader_xyz.cpp
	M			src/reader_xyz.h
	M			src/version.h