Merge branch 'lammps-awesome' into lammps-icms
1aeb6e8011bc
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 7 2010, 04:41.

Description

Merge branch 'lammps-awesome' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 7 2010, 04:41

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1aeb6e8011bc: Merge branch 'lammps-awesome' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 7 2010, 04:41

Commit	Author	Details	Committed
901b778fdb26	Peter Shannon	added files, but they need work	Jun 7 2010
df2f5a39bc77	Peter Shannon	Merge branch 'lammps-axel' into lammps-icms	Jun 7 2010
d9dda5c8a5fb	Peter Shannon	updated Install.sh in CLASS2	Jun 7 2010
6187e01da730	Peter Shannon	Added pair_lj_class2_coul_cut_omp.cpp and pair_lj_class2_coul_cut_omp.h	Jun 7 2010

				Path
	M			src/CLASS2/Install.sh
	P			src/CLASS2/pair_lj_class2_coul_cut_omp.cpp Copied from src/CLASS2/pair_lj_class2_coul_cut.cpp
	P			src/CLASS2/pair_lj_class2_coul_cut_omp.h Copied from src/USER-OPENMP/pair_lj_cut_coul_cut_omp.h
	P			src/CLASS2/pair_lj_class2_omp.cpp Copied from src/CLASS2/pair_lj_class2.cpp
	P			src/CLASS2/pair_lj_class2_omp.h Copied from src/USER-OPENMP/pair_lj_expand_omp.h