Merge branch 'master' into lammps-icms
92b9766cf116
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 7 2012, 15:06.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Section_commands.html
src/displace_box.h

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 7 2012, 15:06

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS92b9766cf116: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 7 2012, 15:06

Commit	Author	Details	Committed
5da2efed0dab	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7714 f3b2605a-c512-4ea7…	Feb 6 2012
3844c08c56cb	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7713 f3b2605a-c512-4ea7…	Feb 6 2012
75990ce095fe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7712 f3b2605a-c512-4ea7…	Feb 6 2012
8972482fd9bf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7711 f3b2605a-c512-4ea7…	Feb 6 2012
4c98b2d1a935	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7710 f3b2605a-c512-4ea7…	Feb 6 2012
ee4ad64c5308	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7708 f3b2605a-c512-4ea7…	Feb 6 2012
37596a506079	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7707 f3b2605a-c512-4ea7…	Feb 6 2012
7a536019cbd7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7705 f3b2605a-c512-4ea7…	Feb 6 2012
6b52c82ee32c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7704 f3b2605a-c512-4ea7…	Feb 6 2012
a3c28800f465	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7703 f3b2605a-c512-4ea7…	Feb 6 2012
c81b8c5d042d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7702 f3b2605a-c512-4ea7…	Feb 6 2012
5f580b66d71f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7701 f3b2605a-c512-4ea7…	Feb 6 2012

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/boundary.html
	M			doc/boundary.txt
	M			doc/change_box.html
	M			doc/change_box.txt
	M			doc/displace_atoms.html
	M			doc/displace_atoms.txt
	D			doc/displace_box.html
	D			doc/displace_box.txt
	M			doc/fix_deform.html
	M			doc/fix_deform.txt
	M			python/lammps.py
	M			src/KSPACE/pppm.cpp
	M			src/MC/fix_bond_create.cpp
	M			src/USER-CUDA/pair_eam_cuda.cpp
	M			src/change_box.cpp
	V			src/{change_box.h ← displace_box.h}
	D			src/displace_box.cpp
	V			src/{displace_box.h → change_box.h}
	M			src/domain.cpp
	M			src/domain.h
	M			src/input.cpp
	M			src/pair_hybrid.cpp
	M			src/pair_table.cpp
	M			src/read_restart.cpp
	M			src/version.h