Merge branch 'master' into lammps-icms
2e265787a11b
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 13 2012, 15:24.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 13 2012, 15:24

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2e265787a11b: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 13 2012, 15:24

Commit	Author	Details	Committed
654ef00885ed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7551 f3b2605a-c512-4ea7…	Jan 12 2012
cb1c578c0258	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7550 f3b2605a-c512-4ea7…	Jan 12 2012
04d322652f6e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7549 f3b2605a-c512-4ea7…	Jan 12 2012
cc84c41ef0eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7547 f3b2605a-c512-4ea7…	Jan 12 2012
ec06aed001ee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7546 f3b2605a-c512-4ea7…	Jan 12 2012

				Path
	M			doc/dump_image.html
	M			doc/dump_image.txt
	M			examples/README
	M			examples/colloid/in.colloid
	M			examples/comb/in.comb.Cu
	M			examples/comb/in.comb.HfO2
	M			examples/comb/in.comb.Si
	M			examples/crack/in.crack
	M			examples/dipole/in.dipole
	M			examples/eim/in.eim
	M			examples/ellipse/in.ellipse.gayberne
	M			examples/ellipse/in.ellipse.resquared
	M			examples/flow/in.flow.couette
	M			examples/flow/in.flow.pois
	M			examples/friction/in.friction
	M			examples/hugoniostat/in.hugoniostat
	M			examples/indent/in.indent
	M			examples/indent/in.indent.min
	M			examples/meam/in.meam
	M			examples/meam/in.meam.shear
	M			examples/melt/in.melt
	M			examples/micelle/in.micelle
	M			examples/min/in.min
	M			examples/min/in.min.box
	M			examples/msst/in.msst
	M			examples/neb/in.neb.hop1
	M			examples/neb/in.neb.hop2
	M			examples/nemd/in.nemd
	M			examples/obstacle/in.obstacle
	M			examples/peptide/in.peptide
	M			examples/peri/in.peri
	M			examples/pour/in.pour
	M			examples/pour/in.pour.2d
	M			examples/prd/in.prd
	M			examples/reax/in.reax.rdx
	M			examples/reax/in.reax.tatb
	M			examples/reax/in.reaxc.rdx
	M			examples/reax/in.reaxc.tatb
	M			examples/rigid/in.rigid
	M			examples/rigid/in.rigid.poems
	M			examples/rigid/in.rigid.poems2
	M			examples/shear/in.shear
	M			examples/shear/in.shear.void
	M			examples/srd/in.srd.mixture
	M			examples/srd/in.srd.pure
	M			examples/tad/in.tad
	M			src/dump_image.cpp
	M			src/version.h