Merge branch 'lammps-icms' into merge-qe-qmmm
c4529dc00a4d
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 10 2016, 13:14.

Description

Merge branch 'lammps-icms' into merge-qe-qmmm

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 10 2016, 13:14

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc4529dc00a4d: Merge branch 'lammps-icms' into merge-qe-qmmm (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 10 2016, 13:14

Commit	Author	Details	Committed
8363441a2804	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jul 10 2016
5ea854de2eae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15280 f3b2605a-c512-4ea7…	Jul 9 2016
4484686077fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15279 f3b2605a-c512-4ea7…	Jul 9 2016
a33753ae6f46	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15278 f3b2605a-c512-4ea7…	Jul 9 2016
80b6719d686f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15277 f3b2605a-c512-4ea7…	Jul 9 2016
ee6f9b96211a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15276 f3b2605a-c512-4ea7…	Jul 9 2016
28faf109808a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15275 f3b2605a-c512-4ea7…	Jul 9 2016
6bc507cd6aed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15274 f3b2605a-c512-4ea7…	Jul 9 2016
18b0426c99ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15273 f3b2605a-c512-4ea7…	Jul 9 2016

				Path
	M			doc/src/Manual.txt
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/fix_shear_history.cpp
	M			src/fix_shear_history.h
	M			src/neigh_derive.cpp
	M			src/neigh_gran.cpp
	M			src/neigh_list.cpp
	M			src/neigh_list.h
	M			src/neigh_request.cpp
	M			src/neigh_request.h
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/pair.h
	M			src/pair_hybrid.cpp
	M			src/version.h