Merge branch 'master' into openmp-step2
50b3b18ab025
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 30 2011, 14:14.

Description

Merge branch 'master' into openmp-step2

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 30 2011, 14:14

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS50b3b18ab025: Merge branch 'master' into openmp-step2 (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 30 2011, 14:14

Commit	Author	Details	Committed
688c433eb998	athomps	Added pair_style lj/cubic	Aug 29 2011
5e2892aaccef	athomps	Added pair_style lj/cubic	Aug 29 2011
92ab39a01a4a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6852 f3b2605a-c512-4ea7…	Aug 29 2011

				Path
	A			doc/pair_lj_cubic.html
	A			doc/pair_lj_cubic.txt
	M			src/fix_ave_spatial.cpp
	P			src/pair_lj_cubic.cpp Copied from src/USER-MISC/pair_lj_sf.cpp
	P			src/pair_lj_cubic.h Copied from src/pair_lj_gromacs.h