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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 11 2014, 12:22.

Description

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

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 11 2014, 12:22

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS00a141d5ce10: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 11 2014, 12:22

Commit	Author	Details	Committed
e579757de1f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11771 f3b2605a-c512-4ea7…	Apr 11 2014
7141b812c299	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11770 f3b2605a-c512-4ea7…	Apr 11 2014
1e2c5374d964	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11769 f3b2605a-c512-4ea7…	Apr 11 2014
7e30710d5d36	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11768 f3b2605a-c512-4ea7…	Apr 11 2014
40f2d71adb4a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11767 f3b2605a-c512-4ea7…	Apr 10 2014
0343052dc97d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11766 f3b2605a-c512-4ea7…	Apr 10 2014
e6edae391699	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11765 f3b2605a-c512-4ea7…	Apr 10 2014

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/fix_bond_swap.html
	M			doc/fix_bond_swap.txt
	M			src/GRANULAR/fix_pour.h
	M			src/MANYBODY/fix_qeq_comb.cpp
	M			src/MC/fix_bond_create.cpp
	M			src/MC/fix_bond_swap.cpp
	M			src/MC/fix_bond_swap.h
	M			src/PERI/fix_peri_neigh.cpp
	M			src/USER-REAXC/fix_qeq_reax.cpp
	M			src/delete_atoms.cpp
	M			src/modify.cpp
	M			src/neigh_full.cpp
	M			src/neigh_half_bin.cpp
	M			src/neigh_half_multi.cpp
	M			src/neigh_list.cpp
	M			src/neigh_list.h
	M			src/neigh_respa.cpp
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/version.h