Merge branch 'master' into lammps-icms
1640f6b098f6
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 12 2010, 16:14.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 12 2010, 16:14

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1640f6b098f6: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 12 2010, 16:14

Commit	Author	Details	Committed
733eb154db16	athomps	Tweaked TATB output	Nov 12 2010
5ad9bfe32c59	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5236 f3b2605a-c512-4ea7…	Nov 11 2010
5f35c38599ed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5235 f3b2605a-c512-4ea7…	Nov 11 2010
b1918d47632a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5234 f3b2605a-c512-4ea7…	Nov 11 2010
71a6b77ea8c4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5233 f3b2605a-c512-4ea7…	Nov 10 2010
44b5e9b49660	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5232 f3b2605a-c512-4ea7…	Nov 10 2010
f27a73ad68b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5231 f3b2605a-c512-4ea7…	Nov 10 2010

				Path
	V			doc/JPG/{screenshot1.jpg → screenshot_gl.jpg}
	V			doc/JPG/{screenshot1_small.jpg → screenshot_gl_small.jpg}
	A			doc/JPG/screenshot_atomeye.jpg
	A			doc/JPG/screenshot_atomeye_small.jpg
	V			doc/JPG/{screenshot_gl.jpg ← screenshot1.jpg}
	V			doc/JPG/{screenshot_gl_small.jpg ← screenshot1_small.jpg}
	A			doc/JPG/screenshot_pymol.jpg
	A			doc/JPG/screenshot_pymol_small.jpg
	M			doc/Section_python.html
	M			doc/Section_python.txt
	M			doc/neb.html
	M			examples/reax/control.reax_c.tatb
	M			python/README
	P			python/examples/pizza/pdbfile.py Copied from tools/python/pizza/pdbfile.py
	M			src/version.h