Diffusion lammps d46562c6efa7

Merge branch 'master' into master-small-fixes
d46562c6efa7
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 19 2010, 13:34.

Description

Merge branch 'master' into master-small-fixes

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 19 2010, 13:34

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSb3de0db9db30: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4326 f3b2605a-c512-4ea7…
rLAMMPS18bfaf1b2677: Merge branch 'master' into master-small-fixes

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd46562c6efa7: Merge branch 'master' into master-small-fixes (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 19 2010, 13:34

Merged Changes

Commit	Author	Details	Committed
b3de0db9db30	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4326 f3b2605a-c512-4ea7…	Jun 18 2010
c71f0cf9f8a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4324 f3b2605a-c512-4ea7…	Jun 18 2010
4eda3e368886	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4323 f3b2605a-c512-4ea7…	Jun 18 2010
79d83814e3d7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4322 f3b2605a-c512-4ea7…	Jun 18 2010
6d6a62213e12	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4321 f3b2605a-c512-4ea7…	Jun 18 2010
9600268de947	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4320 f3b2605a-c512-4ea7…	Jun 18 2010
8190e79a1c06	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4318 f3b2605a-c512-4ea7…	Jun 18 2010
8ffc7c464a9e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4317 f3b2605a-c512-4ea7…	Jun 18 2010
f8c2900a1d13	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4316 f3b2605a-c512-4ea7…	Jun 18 2010
0038e68b2a84	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4305 f3b2605a-c512-4ea7…	Jun 18 2010
b3039e9e2aee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4304 f3b2605a-c512-4ea7…	Jun 18 2010
2110a2942748	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4302 f3b2605a-c512-4ea7…	Jun 18 2010
2b95d21d58d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4300 f3b2605a-c512-4ea7…	Jun 18 2010
aadd0209bf88	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4299 f3b2605a-c512-4ea7…	Jun 18 2010
d8b96e902703	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4298 f3b2605a-c512-4ea7…	Jun 18 2010
7e402f387132	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4297 f3b2605a-c512-4ea7…	Jun 18 2010
c3414bf5f612	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4296 f3b2605a-c512-4ea7…	Jun 18 2010
f3404df0f437	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4295 f3b2605a-c512-4ea7…	Jun 18 2010
672b6728e8df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4294 f3b2605a-c512-4ea7…	Jun 18 2010
9f1c507de306	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4293 f3b2605a-c512-4ea7…	Jun 18 2010

Changes (37)

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/compute_property_local.html
	M			doc/compute_property_local.txt
	M			doc/fix.html
	M			doc/fix.txt
	M			doc/pair_lubricate.html
	M			doc/pair_lubricate.txt
	M			doc/pair_soft.html
	M			doc/pair_soft.txt
	M			doc/run.html
	M			doc/run.txt
	M			examples/micelle/in.micelle
	M			src/COLLOID/pair_colloid.cpp
	M			src/COLLOID/pair_lubricate.cpp
	M			src/COLLOID/pair_lubricate.h
	M			src/MOLECULE/bond_table.cpp
	M			src/Makefile
	M			src/compute_dihedral_local.cpp
	M			src/compute_erotate_sphere.cpp
	M			src/compute_property_local.cpp
	M			src/compute_property_local.h
	M			src/compute_reduce.cpp
	A			src/fix_adapt.cpp
	P			src/fix_adapt.h Copied from src/fix_nve_noforce.h
	M			src/fix_aveforce.cpp
	M			src/fix_wall_reflect.cpp
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_hybrid.h
	M			src/pair_hybrid_overlay.h
	M			src/pair_soft.cpp
	M			src/pair_soft.h
	M			src/pair_table.cpp
	M			src/region_cone.cpp
	M			src/region_cylinder.cpp
	M			src/version.h