Diffusion lammps 9272bcd98ad0

Merge branch 'master' into lammps-icms
9272bcd98ad0
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 29 2010, 14:52.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 29 2010, 14:52

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS20934f12036a: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4361 f3b2605a-c512-4ea7…
rLAMMPS337bbb2a359a: Merge branch 'single-prec-fft' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS9272bcd98ad0: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 29 2010, 14:52

Merged Changes

Commit	Author	Details	Committed
20934f12036a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4361 f3b2605a-c512-4ea7…	Jun 29 2010
2d9472fe472d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4360 f3b2605a-c512-4ea7…	Jun 29 2010
0d077cbc2ebc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4359 f3b2605a-c512-4ea7…	Jun 29 2010
68491cefa0c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4358 f3b2605a-c512-4ea7…	Jun 29 2010
e32c16e56607	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4356 f3b2605a-c512-4ea7…	Jun 29 2010
d71b08845788	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4355 f3b2605a-c512-4ea7…	Jun 29 2010
04104a32d5c2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4353 f3b2605a-c512-4ea7…	Jun 28 2010
5e21c93a0bc3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4352 f3b2605a-c512-4ea7…	Jun 28 2010
8ec83a8bf2ab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4350 f3b2605a-c512-4ea7…	Jun 28 2010
63356f6abbdf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4349 f3b2605a-c512-4ea7…	Jun 28 2010
1dae534808e1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4347 f3b2605a-c512-4ea7…	Jun 28 2010
91b288bfcbf0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4345 f3b2605a-c512-4ea7…	Jun 28 2010
1c4a40ba12ac	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4344 f3b2605a-c512-4ea7…	Jun 28 2010
2238c1ca6fe0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4343 f3b2605a-c512-4ea7…	Jun 28 2010
304376aa024a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4342 f3b2605a-c512-4ea7…	Jun 28 2010

Changes (21)

				Path
	M			doc/fix_wall_gran.html
	M			doc/fix_wall_gran.txt
	M			doc/pair_hybrid.html
	M			doc/pair_hybrid.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			src/ASPHERE/Install.sh
	A			src/GPU/Package.sh
	M			src/MANYBODY/Install.sh
	M			src/MANYBODY/pair_eam.cpp
	M			src/MANYBODY/pair_eam_alloy.cpp
	M			src/MANYBODY/pair_eam_fs.cpp
	M			src/MOLECULE/angle_hybrid.cpp
	A			src/OPT/Package.sh
	M			src/Package.sh
	M			src/bond_hybrid.cpp
	M			src/finish.cpp
	M			src/fix_efield.cpp
	M			src/neigh_list.cpp
	M			src/variable.cpp
	M			src/version.h