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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 1 2013, 21:00.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 1 2013, 21:00

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	538bd16793ed			athomps	Fixed clashes between #define constants in header files	Feb 26 2013

				Path
	M			src/USER-REAXC/fix_reaxc_bonds.cpp
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/USER-REAXC/reaxc_defs.h