Diffusion lammps 8affd9162df9

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 11 2013, 16:04.

Description

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

Resolved Conflicts:
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 11 2013, 16:04

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSe5f496698656: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10760 f3b2605a-c512-4ea7…
rLAMMPS69b65ebdef67: Merge remote branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8affd9162df9: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 11 2013, 16:04

Merged Changes

Commit	Author	Details	Committed
e5f496698656	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10760 f3b2605a-c512-4ea7…	Sep 11 2013
0b3c75bf6d41	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10757 f3b2605a-c512-4ea7…	Sep 11 2013
7172e4ced590	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10756 f3b2605a-c512-4ea7…	Sep 11 2013
14df2cfca11f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10755 f3b2605a-c512-4ea7…	Sep 11 2013
08de04c192d5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10753 f3b2605a-c512-4ea7…	Sep 11 2013
e7e46657c48a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10752 f3b2605a-c512-4ea7…	Sep 11 2013
d9b19cf6ba16	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10748 f3b2605a-c512-4ea7…	Sep 11 2013
d3ad71c4c5c5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10745 f3b2605a-c512-4ea7…	Sep 10 2013

Changes (59)

		Path
M		doc/Manual.html
M		doc/Manual.txt
M		doc/fix_srd.html
M		doc/fix_srd.txt
A	(dir)	examples/ASPHERE/
A		examples/ASPHERE/README
A	(dir)	examples/ASPHERE/box/
A		examples/ASPHERE/box/box.py
A		examples/ASPHERE/box/data.box
A		examples/ASPHERE/box/in.box
A		examples/ASPHERE/box/in.box.mp
A		examples/ASPHERE/box/log.box.10Sep13
A		examples/ASPHERE/box/log.box.mp.10Sep13
A	(dir)	examples/ASPHERE/dimer/
A		examples/ASPHERE/dimer/data.dimer
A		examples/ASPHERE/dimer/dimer.py
A		examples/ASPHERE/dimer/in.dimer
A		examples/ASPHERE/dimer/in.dimer.mp
A		examples/ASPHERE/dimer/log.dimer.10Sep13
A		examples/ASPHERE/dimer/log.dimer.mp.10Sep13
A	(dir)	examples/ASPHERE/ellipsoid/
A		examples/ASPHERE/ellipsoid/in.ellipsoid
A		examples/ASPHERE/ellipsoid/in.ellipsoid.mp
A		examples/ASPHERE/ellipsoid/log.ellipsoid.10Sep13
A		examples/ASPHERE/ellipsoid/log.ellipsoid.mp.10Sep13
A	(dir)	examples/ASPHERE/line/
A		examples/ASPHERE/line/data.line
A		examples/ASPHERE/line/data.line.srd
A		examples/ASPHERE/line/in.line
A		examples/ASPHERE/line/in.line.srd
A		examples/ASPHERE/line/line.py
A		examples/ASPHERE/line/line.srd.py
A		examples/ASPHERE/line/line.srd.viz.py
A		examples/ASPHERE/line/line.viz.py
A		examples/ASPHERE/line/log.line.10Sep13
A		examples/ASPHERE/line/log.line.srd.10Sep13
A	(dir)	examples/ASPHERE/poly/
A		examples/ASPHERE/poly/in.poly
A		examples/ASPHERE/poly/in.poly.mp
A		examples/ASPHERE/poly/log.poly.10Sep13
A		examples/ASPHERE/poly/log.poly.mp.10Sep13
A	(dir)	examples/ASPHERE/star/
A		examples/ASPHERE/star/data.star
A		examples/ASPHERE/star/in.star
A		examples/ASPHERE/star/in.star.mp
A		examples/ASPHERE/star/log.star.10Sep13
A		examples/ASPHERE/star/log.star.mp.10Sep13
A		examples/ASPHERE/star/star.py
A	(dir)	examples/ASPHERE/tri/
A		examples/ASPHERE/tri/data.tri.srd
A		examples/ASPHERE/tri/in.tri.srd
A		examples/ASPHERE/tri/log.tri.srd.10Sep13
A		examples/ASPHERE/tri/tri.srd.py
A		examples/ASPHERE/tri/tri.srd.viz.py
M		examples/README
M		src/MANYBODY/pair_comb.cpp
M		src/fix_property_atom.cpp
M		src/version.h
M		tools/pymol_asphere/src/Makefile