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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 12 2014, 02:43.

Description

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

Resolved Conflicts:
src/USER-FEP/fix_adapt_fep.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 12 2014, 02:43

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
165dcc31ce4a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12634 f3b2605a-c512-4ea7…	Oct 10 2014
b1fea4af6c16	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12633 f3b2605a-c512-4ea7…	Oct 10 2014
04a786241d24	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12632 f3b2605a-c512-4ea7…	Oct 10 2014
a9906d102356	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12631 f3b2605a-c512-4ea7…	Oct 10 2014
13ebe937e2cf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12630 f3b2605a-c512-4ea7…	Oct 10 2014

				Path
	M			potentials/CdTe.bop.table
	M			potentials/GaAs.bop.table
	M			src/MANYBODY/pair_bop.cpp
	M			src/USER-FEP/fix_adapt_fep.cpp
	M			src/USER-INTEL/intel_buffers.cpp
	M			src/USER-INTEL/intel_buffers.h
	M			src/USER-INTEL/neigh_half_bin_intel.cpp
	M			src/accelerator_intel.h
	M			src/fix_adapt.cpp
	M			src/fix_nh.cpp