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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 5 2013, 14:04.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/lattice.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 5 2013, 14:04

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf68c9e83860a: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 5 2013, 14:04

Commit	Author	Details	Committed
12ce90776f0d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10023 f3b2605a-c512-4ea7…	Jun 4 2013
34185a80b11b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10020 f3b2605a-c512-4ea7…	Jun 4 2013
a81c9ac155c4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10019 f3b2605a-c512-4ea7…	Jun 4 2013
224aa5c681ed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10018 f3b2605a-c512-4ea7…	Jun 4 2013
a1d1b9873a7f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10017 f3b2605a-c512-4ea7…	Jun 4 2013
ff3489475141	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10016 f3b2605a-c512-4ea7…	Jun 4 2013
d693bd7413f8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10015 f3b2605a-c512-4ea7…	Jun 4 2013
4b8e84a2d615	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10013 f3b2605a-c512-4ea7…	Jun 4 2013
d64aa231003a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10012 f3b2605a-c512-4ea7…	Jun 4 2013
c886f137b01d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10011 f3b2605a-c512-4ea7…	Jun 4 2013
7f18289ee36e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10010 f3b2605a-c512-4ea7…	Jun 4 2013
a6e871f0a523	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10009 f3b2605a-c512-4ea7…	Jun 4 2013

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_cg.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_disp_tip4p.cpp
	M			src/MOLECULE/atom_vec_angle.cpp
	M			src/MOLECULE/atom_vec_bond.cpp
	M			src/MOLECULE/atom_vec_full.cpp
	M			src/MOLECULE/atom_vec_molecular.cpp
	M			src/USER-MISC/README
	M			src/balance.cpp
	M			src/compute_pe_atom.cpp
	M			src/compute_stress_atom.cpp
	M			src/domain.cpp
	M			src/force.cpp
	M			src/kspace.cpp
	M			src/neigh_list.h
	M			src/neighbor.cpp
	M			src/pair.cpp
	M			src/version.h