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

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

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/SNAP/sna.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 9 2014, 13:21

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

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

Commit	Author	Details	Committed
1a4c75e8e57b	athomps	Added Axel's changes to the OMP parts	Sep 8 2014
ddb099310314	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12444 f3b2605a-c512-4ea7…	Sep 8 2014
96732223f85f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12443 f3b2605a-c512-4ea7…	Sep 8 2014
17430afebe95	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12442 f3b2605a-c512-4ea7…	Sep 8 2014
b2b618a17b6a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12441 f3b2605a-c512-4ea7…	Sep 8 2014
99bf546eb0a4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12440 f3b2605a-c512-4ea7…	Sep 8 2014
1b19868c9760	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12439 f3b2605a-c512-4ea7…	Sep 8 2014
6b14499eb21a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12438 f3b2605a-c512-4ea7…	Sep 8 2014
bfdd21ffae47	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12437 f3b2605a-c512-4ea7…	Sep 8 2014
7551af229efe	athomps	Add line describing snap	Sep 8 2014
9cefb572726d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12435 f3b2605a-c512-4ea7…	Sep 8 2014
a0b94e9053fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12434 f3b2605a-c512-4ea7…	Sep 8 2014
bcb5c5a6e515	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12433 f3b2605a-c512-4ea7…	Sep 8 2014

		Path
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_accelerate.html
M		doc/Section_accelerate.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_example.html
M		doc/Section_example.txt
M		doc/Section_intro.html
M		doc/Section_intro.txt
A		doc/fix_qeq.html
A		doc/fix_qeq.txt
M		examples/README
A	(dir)	examples/qeq/
P		examples/qeq/data.CHO Copied from examples/reax/CHO/data.CHO
A		examples/qeq/data.aC
P		examples/qeq/ffield.reax.cho Copied from examples/reax/CHO/ffield.reax.cho
A		examples/qeq/in.qeq.buck
A		examples/qeq/in.qeq.reaxc
A		examples/qeq/log.qeq.buck.8Sep14.linux.1
A		examples/qeq/log.qeq.buck.8Sep14.linux.4
A		examples/qeq/log.qeq.reaxc.8Sep14.linux.1
A		examples/qeq/log.qeq.reaxc.8Sep14.linux.4
P		examples/qeq/param.qeq.reax Copied from examples/reax/CHO/param.qeq
A		examples/qeq/param.qeq1
A		examples/qeq/param.qeq2
D		src/MAKE/#Makefile.g++#
M		src/Makefile
A	(dir)	src/QEQ/
A		src/QEQ/fix_qeq.cpp
A		src/QEQ/fix_qeq.h
A		src/QEQ/fix_qeq_dynamic.cpp
A		src/QEQ/fix_qeq_dynamic.h
A		src/QEQ/fix_qeq_point.cpp
A		src/QEQ/fix_qeq_point.h
A		src/QEQ/fix_qeq_shielded.cpp
A		src/QEQ/fix_qeq_shielded.h
A		src/QEQ/fix_qeq_slater.cpp
A		src/QEQ/fix_qeq_slater.h
M		src/SNAP/sna.cpp
M		src/SNAP/sna.h
M		src/version.h