Merge remote branch 'lammps-ro/master' into lammps-icms
05fe174d76cb
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 25 2016, 17:39.

Description

Merge remote branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/compute_pair.txt
src/USER-CUDA/verlet_cuda.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 25 2016, 17:39

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS05fe174d76cb: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 25 2016, 17:39

Commit	Author	Details	Committed
b5e95a0a14c6	stamoor	Fixing USER-CUDA compile error	Feb 24 2016
dbd259948ba0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14675 f3b2605a-c512-4ea7…	Feb 24 2016
98b34b6311aa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14673 f3b2605a-c512-4ea7…	Feb 24 2016
a4e33d30969a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14672 f3b2605a-c512-4ea7…	Feb 24 2016

				Path
	M			doc/Section_modify.html
	M			doc/Section_modify.txt
	M			doc/Section_packages.html
	M			doc/Section_start.txt
	M			doc/_sources/Section_modify.txt
	M			doc/_sources/compute_group_group.txt
	M			doc/_sources/compute_pair.txt
	M			doc/compute_group_group.html
	M			doc/compute_group_group.txt
	M			doc/compute_pair.html
	M			doc/compute_pair.txt
	M			doc/searchindex.js
	M			src/fix_ave_histo.cpp