Merge branch 'master' into lammps-icms
1fa419fa8553
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 3 2013, 14:23.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt
src/USER-MISC/dihedral_table.h
src/comm.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 3 2013, 14:23

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1fa419fa8553: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 3 2013, 14:23

Commit	Author	Details	Committed
df9c70770d8b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9395 f3b2605a-c512-4ea7…	Feb 1 2013
f0c4f5680bcb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9394 f3b2605a-c512-4ea7…	Feb 1 2013
8e9f57b46069	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9392 f3b2605a-c512-4ea7…	Feb 1 2013
f8859b275dfc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9391 f3b2605a-c512-4ea7…	Feb 1 2013
e4eb1da5f7f1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9390 f3b2605a-c512-4ea7…	Feb 1 2013
79490c6d9d96	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9388 f3b2605a-c512-4ea7…	Feb 1 2013
a8582b1cfcd3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9383 f3b2605a-c512-4ea7…	Feb 1 2013
b9e6cda7930d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9382 f3b2605a-c512-4ea7…	Feb 1 2013
3f839cf8f02c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9381 f3b2605a-c512-4ea7…	Feb 1 2013
69a209f09da2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9380 f3b2605a-c512-4ea7…	Feb 1 2013
9b7bd3e8928a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9379 f3b2605a-c512-4ea7…	Feb 1 2013
a1433bf82c8b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9378 f3b2605a-c512-4ea7…	Feb 1 2013

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_intro.html
	M			doc/Section_intro.txt
	V			examples/body/{log.body.1Feb13.linux.1 ← log.body.31Jan13.linux.1}
	A			examples/body/log.body.1Feb13.linux.4
	V			examples/body/{log.body.31Jan13.linux.1 → log.body.1Feb13.linux.1}
	D			examples/body/log.body.31Jan13.linux.2
	M			src/Make.sh
	M			src/USER-MISC/dihedral_table.h
	M			src/atom.cpp
	M			src/atom_vec_body.cpp
	M			src/atom_vec_body.h
	M			src/atom_vec_ellipsoid.cpp
	M			src/atom_vec_line.cpp
	M			src/atom_vec_tri.cpp
	M			src/comm.cpp
	M			src/version.h