Merge branch 'doc-fixes' of github.com:akohlmey/lammps into doc-fixes
53e7fee5b778
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 25 2017, 16:11.

Description

Merge branch 'doc-fixes' of github.com:akohlmey/lammps into doc-fixes

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 25 2017, 16:11

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
88d4150d2bf8	Axel Kohlmeyer	remove trailing whitespace	May 24 2017
ead05f81c09c	Axel Kohlmeyer	Merge branch 'pair_morse_soft-doc-fix' of https://github.	May 24 2017
4f9e7cbd161f	Stefan Paquay	Cleaned up docs for pair_mores, a missing :pre ruined formatting.	May 24 2017
4780d72809c0	Axel Kohlmeyer	use '&&' and '\|\|' instead of 'and' and 'or' operators for consistency	May 22 2017

				Path
	M			doc/src/pair_morse.txt
	M			src/MC/pair_dsmc.cpp
	M			src/USER-OMP/fix_nve_sphere_omp.cpp
	M			src/USER-OMP/npair_full_bin_ghost_omp.h
	M			src/USER-OMP/npair_full_bin_omp.h
	M			src/USER-OMP/npair_full_multi_omp.h
	M			src/USER-OMP/npair_full_nsq_ghost_omp.h
	M			src/USER-OMP/npair_full_nsq_omp.h
	M			src/USER-OMP/npair_half_bin_newtoff_ghost_omp.cpp
	M			src/USER-OMP/npair_half_bin_newtoff_ghost_omp.h
	M			src/USER-OMP/npair_half_multi_newton_tri_omp.cpp
	M			src/USER-OMP/npair_half_nsq_newtoff_ghost_omp.cpp
	M			src/USER-OMP/npair_half_nsq_newtoff_ghost_omp.h
	M			src/USER-OMP/npair_half_respa_bin_newtoff_omp.cpp
	M			src/USER-OMP/npair_half_respa_bin_newtoff_omp.h
	M			src/USER-OMP/npair_half_respa_bin_newton_omp.cpp
	M			src/USER-OMP/npair_half_respa_bin_newton_tri_omp.cpp
	M			src/USER-OMP/npair_half_respa_nsq_newtoff_omp.cpp
	M			src/USER-OMP/npair_half_respa_nsq_newtoff_omp.h
	M			src/USER-OMP/npair_half_respa_nsq_newton_omp.cpp
	M			src/USER-OMP/npair_half_respa_nsq_newton_omp.h
	M			src/USER-OMP/npair_half_size_bin_newtoff_omp.cpp
	M			src/USER-OMP/npair_half_size_bin_newtoff_omp.h
	M			src/USER-OMP/npair_half_size_bin_newton_omp.cpp
	M			src/USER-OMP/npair_half_size_bin_newton_tri_omp.cpp
	M			src/USER-OMP/npair_half_size_nsq_newtoff_omp.cpp
	M			src/USER-OMP/npair_half_size_nsq_newtoff_omp.h
	M			src/USER-OMP/npair_half_size_nsq_newton_omp.cpp
	M			src/USER-OMP/npair_half_size_nsq_newton_omp.h
	M			src/USER-OMP/npair_halffull_newtoff_omp.h
	M			src/USER-OMP/npair_halffull_newton_omp.h
	M			src/USER-OMP/pair_airebo_omp.cpp
	M			src/USER-OMP/pair_lj_cut_thole_long_omp.cpp