Merge remote branch 'lammps-ro/master' into lammps-icms
0f7f4a1e43d1
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 21 2014, 13:58.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/gpu/lal_device.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 21 2014, 13:58

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS0f7f4a1e43d1: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 21 2014, 13:58

Commit	Author	Details	Committed
c64a797231b5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11664 f3b2605a-c512-4ea7…	Mar 20 2014
3e6e58bc025d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11663 f3b2605a-c512-4ea7…	Mar 20 2014
1ce84626f2f6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11662 f3b2605a-c512-4ea7…	Mar 20 2014
8d9e3945dd74	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11661 f3b2605a-c512-4ea7…	Mar 20 2014
67afd6fb6813	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11660 f3b2605a-c512-4ea7…	Mar 20 2014
e1cc86a12ff4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11659 f3b2605a-c512-4ea7…	Mar 20 2014
0ebae651826c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11658 f3b2605a-c512-4ea7…	Mar 20 2014
8b9e65805de8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11657 f3b2605a-c512-4ea7…	Mar 20 2014
d84c29d1aa7a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11656 f3b2605a-c512-4ea7…	Mar 20 2014

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/pair_dpd.html
	M			doc/pair_dpd.txt
	M			lib/gpu/Nvidia.makefile
	M			lib/gpu/Opencl.makefile
	M			lib/gpu/lal_atom.cpp
	M			lib/gpu/lal_atom.h
	P			lib/gpu/lal_base_dpd.cpp Copied from lib/gpu/lal_base_charge.cpp
	P			lib/gpu/lal_base_dpd.h Copied from lib/gpu/lal_base_dipole.h
	M			lib/gpu/lal_device.cpp
	M			lib/gpu/lal_device.h
	P			lib/gpu/lal_dpd.cpp Copied from lib/gpu/lal_soft.cpp
	P			lib/gpu/lal_dpd.h Copied from lib/gpu/lal_coul_dsf.h
	A			lib/gpu/lal_dpd_ext.cpp
	M			src/GPU/Install.sh
	M			src/GPU/fix_gpu.cpp
	A			src/GPU/pair_dpd_gpu.cpp
	P			src/GPU/pair_dpd_gpu.h Copied from src/GPU/pair_buck_gpu.h
	A			src/GPU/pair_dpd_tstat_gpu.cpp
	P			src/GPU/pair_dpd_tstat_gpu.h Copied from src/GPU/pair_buck_gpu.h
	M			src/compute_group_group.cpp
	M			src/neighbor.cpp
	M			src/version.h