Axel Kohlmeyer 2b1e3a30bd Merge remote branch 'lammps-ro/master' into lammps-icms ...

Resolved Conflicts:
	doc/Manual.txt
	doc/fix_tune_kspace.txt
	doc/group2ndx.txt
	src/DIPOLE/atom_vec_dipole.cpp
	src/DIPOLE/pair_lj_long_dipole_long.cpp
	src/MOLECULE/atom_vec_angle.cpp
	src/MOLECULE/atom_vec_bond.cpp
	src/MOLECULE/atom_vec_full.cpp
	src/MOLECULE/atom_vec_molecular.cpp
	src/PERI/atom_vec_peri.cpp
	src/USER-AWPMD/atom_vec_wavepacket.cpp
	src/USER-COLVARS/README
	src/USER-EFF/atom_vec_electron.cpp
	src/USER-SPH/atom_vec_meso.cpp
	src/atom.h
	src/atom_vec_atomic.cpp
	src/atom_vec_body.cpp
	src/atom_vec_charge.cpp
	src/atom_vec_ellipsoid.cpp
	src/atom_vec_line.cpp
	src/atom_vec_sphere.cpp
	src/atom_vec_tri.cpp
	src/fix_restrain.cpp
	src/force.cpp
	tools/restart2data.cpp

2013-06-28 13:09:52 +02:00

..

fix_reax_bonds.cpp

massive patch to flag non-numeric input

2013-06-23 14:34:38 +02:00

fix_reax_bonds.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

Install.sh

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9987 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-05-31 15:17:46 +00:00

pair_reax_fortran.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_reax.cpp

undo manybody check in anticipation of steve's modified version.

2013-06-27 22:50:54 +02:00

pair_reax.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00