Merge branch 'master' into lammps-icms
f3b6503ffa93
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 2 2013, 13:12.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt
doc/log.txt
src/USER-REAXC/fix_reaxc_species.cpp
src/input.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 2 2013, 13:12

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf3b6503ffa93: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 2 2013, 13:12

Commit	Author	Details	Committed
51191ebdc04e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10844 f3b2605a-c512-4ea7…	Oct 1 2013
2a892f05d703	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10843 f3b2605a-c512-4ea7…	Oct 1 2013
35eb67c68ef8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10842 f3b2605a-c512-4ea7…	Oct 1 2013
72d59c438d29	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10841 f3b2605a-c512-4ea7…	Oct 1 2013
7d0088da799b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10840 f3b2605a-c512-4ea7…	Oct 1 2013
0a0a430c937e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10839 f3b2605a-c512-4ea7…	Oct 1 2013
09d10121a0e7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10838 f3b2605a-c512-4ea7…	Oct 1 2013
49550263e2ac	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10837 f3b2605a-c512-4ea7…	Oct 1 2013
0bbc1aae7b3d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10836 f3b2605a-c512-4ea7…	Oct 1 2013

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/log.html
	M			doc/log.txt
	M			src/COLLOID/pair_colloid.cpp
	M			src/MISC/fix_efield.cpp
	M			src/MISC/fix_efield.h
	A			src/USER-REAXC/compute_spec_atom.cpp
	A			src/USER-REAXC/compute_spec_atom.h
	M			src/USER-REAXC/fix_reaxc_species.cpp
	M			src/USER-REAXC/fix_reaxc_species.h
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/USER-REAXC/pair_reax_c.h
	M			src/input.cpp
	M			src/version.h