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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 23 2014, 14:21.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Dec 23 2014, 14:21

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
31b5481be271	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12855 f3b2605a-c512-4ea7…	Dec 23 2014
0f810003a174	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12854 f3b2605a-c512-4ea7…	Dec 23 2014
b43dc0e05fc7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12853 f3b2605a-c512-4ea7…	Dec 23 2014
f6b81b0881d5	athomps	Added logfreq2	Dec 22 2014
baccbaeda8fc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12851 f3b2605a-c512-4ea7…	Dec 22 2014
6429e05b7861	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12850 f3b2605a-c512-4ea7…	Dec 22 2014

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/accelerate_intel.html
	M			doc/accelerate_intel.txt
	M			doc/package.html
	M			doc/package.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			src/USER-INTEL/README
	M			src/USER-INTEL/fix_intel.cpp
	M			src/USER-INTEL/fix_intel.h
	M			src/USER-INTEL/intel_buffers.cpp
	M			src/USER-INTEL/intel_preprocess.h
	M			src/USER-INTEL/pair_gayberne_intel.cpp
	M			src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
	M			src/USER-INTEL/pair_lj_cut_coul_long_intel.cpp
	M			src/USER-INTEL/pair_lj_cut_intel.cpp
	M			src/variable.cpp
	M			src/version.h