Diffusion lammps 00d9f400ba98

Merge remote branch 'lammps-ro/master' into lammps-icms
00d9f400ba98
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 13 2013, 12:43.

Description

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

Resolved Conflicts:
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 13 2013, 12:43

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS97ced25de0d6: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10779 f3b2605a-c512-4ea7…
rLAMMPS8affd9162df9: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS00d9f400ba98: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 13 2013, 12:43

Merged Changes

Commit	Author	Details	Committed
97ced25de0d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10779 f3b2605a-c512-4ea7…	Sep 13 2013
45b4745d5531	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10778 f3b2605a-c512-4ea7…	Sep 13 2013
e45dc6999b92	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10777 f3b2605a-c512-4ea7…	Sep 13 2013
f6096c899a1a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10776 f3b2605a-c512-4ea7…	Sep 13 2013
4fe160c56ec2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10775 f3b2605a-c512-4ea7…	Sep 13 2013
880ba18d3870	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10774 f3b2605a-c512-4ea7…	Sep 12 2013
5a05c177f8d4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10773 f3b2605a-c512-4ea7…	Sep 12 2013
77412e3248c5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10772 f3b2605a-c512-4ea7…	Sep 12 2013
3d6369b7f526	jzimmer	Removing "stdout" files	Sep 12 2013
df07d554c44e	jzimmer	Deleting faulty "stdout" files	Sep 12 2013
b4be93d626ca	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10767 f3b2605a-c512-4ea7…	Sep 12 2013
f300e03ef61c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10766 f3b2605a-c512-4ea7…	Sep 12 2013
a61a72719f3d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10765 f3b2605a-c512-4ea7…	Sep 12 2013
e76a4743d645	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10764 f3b2605a-c512-4ea7…	Sep 12 2013
2639347e904a	jzimmer	Remove "stdout" files.	Sep 12 2013
aceba1bd01f2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10762 f3b2605a-c512-4ea7…	Sep 12 2013

Changes (42)

		Path
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_howto.html
M		doc/Section_howto.txt
D		doc/USER/atc/svn_add.stdout
D		doc/USER/atc/svn_commit.stdout
M		doc/pair_lj_smooth_linear.html
M		doc/pair_lj_smooth_linear.txt
A	(dir)	examples/KAPPA/
A		examples/KAPPA/README
A		examples/KAPPA/in.heat
A		examples/KAPPA/in.heatflux
A		examples/KAPPA/in.langevin
A		examples/KAPPA/in.mp
A		examples/KAPPA/log.heat.12Sep13
A		examples/KAPPA/log.heatflux.12Sep13
A		examples/KAPPA/log.langevin.12Sep13
A		examples/KAPPA/log.mp.12Sep13
A		examples/KAPPA/profile.heat.12Sep13
A		examples/KAPPA/profile.heatflux.12Sep13
A		examples/KAPPA/profile.langevin.12Sep13
A		examples/KAPPA/profile.mp.12Sep13
M		examples/README
D		examples/USER/atc/svn_add.stdout
D		examples/USER/atc/svn_commit.stdout
A	(dir)	examples/VISCOSITY/
A		examples/VISCOSITY/README
A		examples/VISCOSITY/in.gk.2d
A		examples/VISCOSITY/in.mp.2d
A		examples/VISCOSITY/in.nemd.2d
A		examples/VISCOSITY/in.wall.2d
A		examples/VISCOSITY/log.gk.2d.12Sep13
A		examples/VISCOSITY/log.mp.2d.12Sep13
A		examples/VISCOSITY/log.nemd.2d.12Sep13
A		examples/VISCOSITY/log.wall.2d.12Sep13
A		examples/VISCOSITY/profile.gk.2d.12Sep13
A		examples/VISCOSITY/profile.mp.2d.12Sep13
A		examples/VISCOSITY/profile.nemd.2d.12Sep13
A		examples/VISCOSITY/profile.wall.2d.12Sep13
D		src/USER-ATC/svn_add.stdout
D		src/USER-ATC/svn_commit.stdout
M		src/version.h