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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 9 2013, 12:53.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/MANYBODY/pair_airebo.cpp
src/MANYBODY/pair_comb.cpp
src/MANYBODY/pair_lcbop.cpp
src/USER-OMP/neighbor_omp.h
src/fix_shear_history.cpp
src/my_page.h
src/neigh_list.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 9 2013, 12:53

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSe59d4f6730f4: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10232 f3b2605a-c512-4ea7…
rLAMMPSb249ce65f60c: add thread timers to MSM /omp styles

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS7c9745d49da7: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 9 2013, 12:53

Merged Changes

Commit	Author	Details	Committed
e59d4f6730f4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10232 f3b2605a-c512-4ea7…	Jul 8 2013
156e5941b498	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10231 f3b2605a-c512-4ea7…	Jul 8 2013
60d49a7aad50	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10230 f3b2605a-c512-4ea7…	Jul 8 2013
0b8e46c7e3a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10229 f3b2605a-c512-4ea7…	Jul 8 2013
40319752ad79	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10227 f3b2605a-c512-4ea7…	Jul 8 2013
b9366159e0ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10226 f3b2605a-c512-4ea7…	Jul 8 2013
b13ebf58898a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10224 f3b2605a-c512-4ea7…	Jul 8 2013
496ea3faa2e5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10223 f3b2605a-c512-4ea7…	Jul 8 2013
03626683ea79	athomps	Updated GJF reference	Jul 7 2013

Changes (14)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/fix_gravity.html
	M			doc/fix_gravity.txt
	M			doc/fix_langevin.html
	M			doc/fix_langevin.txt
	M			src/MANYBODY/pair_airebo.cpp
	M			src/MANYBODY/pair_comb.cpp
	M			src/MANYBODY/pair_lcbop.cpp
	M			src/fix_shear_history.cpp
	M			src/my_page.h
	M			src/neigh_list.cpp
	M			src/read_data.cpp
	M			src/version.h