Merge branch 'master' into openmp-master
c26f383996b9
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 15 2011, 15:15.

Description

Merge branch 'master' into openmp-master

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Dec 15 2011, 15:15

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc26f383996b9: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 15 2011, 15:15

Commit	Author	Details	Committed
59165f7114c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7369 f3b2605a-c512-4ea7…	Dec 15 2011
fb16c0eb301b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7368 f3b2605a-c512-4ea7…	Dec 15 2011
6376eeec92e2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7367 f3b2605a-c512-4ea7…	Dec 14 2011
f5c26abaa61a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7366 f3b2605a-c512-4ea7…	Dec 14 2011
e79e5b975c26	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7365 f3b2605a-c512-4ea7…	Dec 14 2011
bac07b76cef2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7364 f3b2605a-c512-4ea7…	Dec 14 2011
a86eeda9b364	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7363 f3b2605a-c512-4ea7…	Dec 14 2011
ea56c1ec97a0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7362 f3b2605a-c512-4ea7…	Dec 14 2011

				Path
	M			doc/Eqs/pair_adp.jpg
	M			doc/Eqs/pair_adp.tex
	M			doc/partition.html
	M			doc/partition.txt
	M			doc/processors.html
	M			doc/processors.txt
	M			src/MOLECULE/pair_lj_charmm_coul_charmm.cpp
	M			src/REPLICA/verlet_split.cpp
	M			src/atom.h
	M			src/comm.cpp
	M			src/procmap.cpp
	M			src/procmap.h
	M			src/thermo.cpp