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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 26 2013, 14:28.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 26 2013, 14:28

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSfb5e2d81ff1c: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 26 2013, 14:28

	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