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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 25 2015, 23:03.

Description

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

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 25 2015, 23:03

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
36383c1449e7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13162 f3b2605a-c512-4ea7…	Feb 25 2015
62bdf7c6fb14	athomps	Added README	Feb 24 2015
512c30572233	athomps	Added README	Feb 24 2015
50dcfc4bada3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13158 f3b2605a-c512-4ea7…	Feb 24 2015
31b96d184242	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13157 f3b2605a-c512-4ea7…	Feb 24 2015
e590f8e4747a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13154 f3b2605a-c512-4ea7…	Feb 24 2015
0c86d87c8bdc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13153 f3b2605a-c512-4ea7…	Feb 24 2015
3d20bb9bd658	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13152 f3b2605a-c512-4ea7…	Feb 24 2015
02d90d07e6fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13151 f3b2605a-c512-4ea7…	Feb 24 2015
cb912c19546c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13150 f3b2605a-c512-4ea7…	Feb 24 2015
471fa5e969a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13149 f3b2605a-c512-4ea7…	Feb 24 2015
2b043c620366	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13148 f3b2605a-c512-4ea7…	Feb 24 2015
71a2a7de637a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13147 f3b2605a-c512-4ea7…	Feb 24 2015

		Path
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_packages.html
M		doc/Section_packages.txt
A		doc/pair_quip.html
A		doc/pair_quip.txt
A	(dir)	examples/USER/quip/
A		examples/USER/quip/data_gap
A		examples/USER/quip/data_sw
A		examples/USER/quip/gap_example.xml
A		examples/USER/quip/gap_example_sparse.dat
A		examples/USER/quip/in.gap
A		examples/USER/quip/in.sw
A		examples/USER/quip/sw_example.xml
M		lib/README
A	(dir)	lib/quip/
A		lib/quip/Makefile.lammps
A		lib/quip/README
M		src/Make.py
M		src/Makefile
M		src/RIGID/fix_shake.cpp
M		src/RIGID/fix_shake.h
A	(dir)	src/USER-QUIP/
P		src/USER-QUIP/Install.sh Copied from src/POEMS/Install.sh
A		src/USER-QUIP/README
A		src/USER-QUIP/pair_quip.cpp
A		src/USER-QUIP/pair_quip.h
M		src/fix_respa.cpp
M		src/fix_respa.h
M		src/version.h