Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
55954dac5c95
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 24 2015, 12:50.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 24 2015, 12:50

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
98a684929234	sjplimp	''	Oct 23 2015
a1a97efc3ede	sjplimp	''	Oct 23 2015
99dcf3ce7df0	sjplimp	''	Oct 23 2015
4e5fa8db12b8	sjplimp	''	Oct 23 2015
7340e1b429f0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14208 f3b2605a-c512-4ea7…	Oct 23 2015
0035a690d15b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14207 f3b2605a-c512-4ea7…	Oct 23 2015
2a1a318ce7c3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14206 f3b2605a-c512-4ea7…	Oct 23 2015
a27957c58f1b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14201 f3b2605a-c512-4ea7…	Oct 23 2015
ff974eb07779	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14200 f3b2605a-c512-4ea7…	Oct 23 2015
f04945de32bf	sjplimp	''	Oct 23 2015
52ceb412e4bf	sjplimp	''	Oct 23 2015
08157510b702	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14197 f3b2605a-c512-4ea7…	Oct 23 2015
e53f61a8691b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14196 f3b2605a-c512-4ea7…	Oct 23 2015

				Path
	M			doc/Manual.html
	M			doc/Manual.html.html
	M			doc/Manual.txt
	M			doc/displace_atoms.html
	M			doc/displace_atoms.txt
	M			doc/doc2/Manual.html.html
	M			doc/doc2/displace_atoms.html
	M			doc/doc2/timestep.html
	M			doc/searchindex.js
	M			doc/timestep.html
	M			doc/timestep.txt
	A			potentials/Mo5.2.mgpt.README
	A			potentials/Mo5.2.mgpt.parmin
	A			potentials/Mo5.2.mgpt.potin
	A			potentials/Ta4.mgpt.README
	A			potentials/Ta4.mgpt.parmin
	A			potentials/Ta4.mgpt.potin
	A			potentials/Ta6.8x.mgpt.README
	A			potentials/Ta6.8x.mgpt.parmin
	A			potentials/Ta6.8x.mgpt.potin
	A			potentials/V6.1.mgpt.README
	A			potentials/V6.1.mgpt.parmin
	A			potentials/V6.1.mgpt.potin
	M			src/KOKKOS/verlet_kokkos.cpp
	M			src/USER-INTEL/verlet_intel.cpp
	M			src/displace_atoms.cpp
	M			src/displace_atoms.h
	M			src/fix_addforce.cpp
	M			src/fix_setforce.cpp
	M			src/version.h