Merge branch 'master' into lammps-icms
00e6043ba2d6
Actions

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

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 16 2010, 12:14

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

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

Commit	Author	Details	Committed
cd2454980d85	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4381 f3b2605a-c512-4ea7…	Jul 16 2010
3e5890065a52	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4380 f3b2605a-c512-4ea7…	Jul 16 2010
6f023fe95744	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4379 f3b2605a-c512-4ea7…	Jul 16 2010
eae2292f8fdb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4378 f3b2605a-c512-4ea7…	Jul 16 2010
b0800a42d594	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4376 f3b2605a-c512-4ea7…	Jul 16 2010
5bbed4347dc4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4375 f3b2605a-c512-4ea7…	Jul 16 2010

				Path
	M			doc/fix_thermal_conductivity.html
	M			doc/fix_thermal_conductivity.txt
	M			doc/fix_viscosity.html
	M			doc/fix_viscosity.txt
	M			src/MAKE/Makefile.redsky
	M			src/fix.h
	M			src/fix_adapt.cpp
	M			src/fix_adapt.h
	M			src/fix_thermal_conductivity.cpp
	M			src/fix_viscosity.cpp
	M			src/modify.cpp
	M			src/modify.h
	M			src/verlet.cpp
	M			src/version.h