Merge branch 'master' into lammps-icms
48fc2fc296d5
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 6 2010, 17:59.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 6 2010, 17:59

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS48fc2fc296d5: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 6 2010, 17:59

Commit	Author	Details	Committed
1468451f26a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4448 f3b2605a-c512-4ea7…	Aug 6 2010
01227fec6700	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4447 f3b2605a-c512-4ea7…	Aug 6 2010
779fb84fd5b3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4446 f3b2605a-c512-4ea7…	Aug 6 2010
149fc49e4fbc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4444 f3b2605a-c512-4ea7…	Aug 6 2010
2f33fc0f54d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4443 f3b2605a-c512-4ea7…	Aug 6 2010
6173fcaaab9f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4442 f3b2605a-c512-4ea7…	Aug 6 2010
5ca111b283d3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4441 f3b2605a-c512-4ea7…	Aug 4 2010
78b6dafa4d3f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4439 f3b2605a-c512-4ea7…	Aug 4 2010
c5f9d387d8ff	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4438 f3b2605a-c512-4ea7…	Aug 4 2010
632eddc43a44	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4437 f3b2605a-c512-4ea7…	Aug 4 2010
8e1612f28838	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4435 f3b2605a-c512-4ea7…	Aug 4 2010
48cb4ac2af9e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4434 f3b2605a-c512-4ea7…	Aug 4 2010
27e88881276f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4433 f3b2605a-c512-4ea7…	Aug 4 2010

				Path
	M			doc/dump_modify.html
	M			doc/dump_modify.txt
	M			doc/fix_adapt.html
	M			doc/fix_adapt.txt
	M			doc/pair_lubricate.html
	M			doc/pair_lubricate.txt
	M			doc/pair_soft.html
	M			doc/pair_soft.txt
	M			doc/special_bonds.html
	M			doc/special_bonds.txt
	M			doc/variable.html
	M			doc/variable.txt
	P			src/MAKE/Makefile.mingw Copied from src/MAKE/Makefile.mingw_cross
	M			src/dump.cpp
	M			src/dump_dcd.cpp
	M			src/force.cpp
	M			src/force.h
	M			src/input.cpp
	M			src/output.cpp
	M			src/output.h
	M			src/special.cpp
	M			src/special.h
	M			src/variable.cpp
	M			src/variable.h
	M			src/version.h