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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 7 2015, 14:41.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 7 2015, 14:41

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd6d368f44721: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 7 2015, 14:41

Commit	Author	Details	Committed
08e77a79b31d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13205 f3b2605a-c512-4ea7…	Mar 6 2015
716a44932cf2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13204 f3b2605a-c512-4ea7…	Mar 6 2015
fafcacaa9707	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13201 f3b2605a-c512-4ea7…	Mar 6 2015
bf8dc7e0698d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13200 f3b2605a-c512-4ea7…	Mar 6 2015
3c499e789636	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13198 f3b2605a-c512-4ea7…	Mar 6 2015
42adc21fe0f4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13197 f3b2605a-c512-4ea7…	Mar 6 2015
83f439bcd837	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13196 f3b2605a-c512-4ea7…	Mar 6 2015

		Path
A		doc/Eqs/pair_cs.jpg
P		doc/Eqs/pair_cs.tex Copied from doc/Eqs/angle_cosine_periodic.tex
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_howto.html
M		doc/Section_howto.txt
M		doc/Section_packages.html
M		doc/Section_packages.txt
A		doc/compute_temp_cs.html
A		doc/compute_temp_cs.txt
M		doc/fix_shake.html
M		doc/fix_shake.txt
A		doc/pair_cs.html
A		doc/pair_cs.txt
M		doc/pair_hybrid.html
M		doc/pair_hybrid.txt
M		examples/README
A	(dir)	examples/coreshell/
A		examples/coreshell/data.coreshell
A		examples/coreshell/in.coreshell
A		examples/coreshell/log.coreshell.6Mar15.linux.1
A		examples/coreshell/log.coreshell.6Mar15.linux.4
A	(dir)	src/CORESHELL/
A		src/CORESHELL/compute_temp_cs.cpp
A		src/CORESHELL/compute_temp_cs.h
P		src/CORESHELL/pair_born_coul_long_cs.cpp Copied from src/OPT/pair_lj_cut_coul_long_opt.cpp
P		src/CORESHELL/pair_born_coul_long_cs.h Copied from src/KSPACE/pair_born_coul_msm.h
P		src/CORESHELL/pair_buck_coul_long_cs.cpp Copied from src/OPT/pair_lj_cut_coul_long_opt.cpp
P		src/CORESHELL/pair_buck_coul_long_cs.h Copied from src/KSPACE/pair_buck_coul_msm.h
M		src/Makefile
M		src/velocity.cpp
M		src/version.h