Merge branch 'merge-pull-38' into lammps-icms
6be61b080360
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 11 2016, 22:56.

Description

Merge branch 'merge-pull-38' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 11 2016, 22:56

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6be61b080360: Merge branch 'merge-pull-38' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 11 2016, 22:56

	Commit			Author	Details	Committed
	c80fb4b8ea06			Axel Kohlmeyer	Merge branch 'pair-morse-smooth-linear-omp' of https://github.	Mar 11 2016
	b6355a077241			Stefan Paquay	Done making changes.	Mar 11 2016

				Path
	M			doc/pair_morse.txt
	P			src/USER-OMP/pair_morse_smooth_linear_omp.cpp Copied from src/USER-OMP/pair_morse_omp.cpp
	P			src/USER-OMP/pair_morse_smooth_linear_omp.h Copied from src/pair_beck.h