Merge branch 'master' into lammps-icms
aa13dbbe66bc
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 27 2012, 16:19.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 27 2012, 16:19

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSaa13dbbe66bc: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 27 2012, 16:19

Commit	Author	Details	Committed
cd50fe777370	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7588 f3b2605a-c512-4ea7…	Jan 27 2012
a91b67d8154c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7586 f3b2605a-c512-4ea7…	Jan 26 2012
7769b329e1b7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7584 f3b2605a-c512-4ea7…	Jan 26 2012
96a4977bd0f6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7582 f3b2605a-c512-4ea7…	Jan 26 2012

				Path
	D			lib/gpu/libgpu.a
	D			lib/gpu/nvc_get_devices
	M			lib/reax/Makefile.lammps
	M			lib/reax/Makefile.lammps.gfortran
	M			lib/reax/Makefile.lammps.ifort
	M			src/USER-REAXC/fix_reaxc_bonds.cpp
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/version.h