Merge remote branch 'lammps-ro/master' into lammps-icms
81506fdb90dc
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 7 2013, 16:06.

Description

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

Resolved Conflicts:
doc/Manual.txt

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 7 2013, 16:06

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS81506fdb90dc: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 7 2013, 16:06

Commit	Author	Details	Committed
c8346ac30378	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9758 f3b2605a-c512-4ea7…	Apr 7 2013
2f1909c5e840	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9757 f3b2605a-c512-4ea7…	Apr 7 2013
eb3276674903	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9756 f3b2605a-c512-4ea7…	Apr 7 2013
f5cd343be84d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9755 f3b2605a-c512-4ea7…	Apr 7 2013
afac9a0f14a9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9754 f3b2605a-c512-4ea7…	Apr 7 2013

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			src/REPLICA/tad.cpp
	M			src/REPLICA/tad.h
	M			src/atom_vec_body.h
	M			src/body.h
	M			src/compute_displace_atom.cpp
	M			src/compute_displace_atom.h
	M			src/compute_msd.cpp
	M			src/compute_msd.h
	M			src/fix.cpp
	M			src/fix.h
	A			src/fix_store.cpp
	P			src/fix_store.h Copied from src/fix_read_restart.h
	M			src/fix_store_state.cpp
	M			src/modify.cpp
	V			src/{my_pool.h → my_pool_chunk.h}
	V			src/{my_pool_chunk.h ← my_pool.h}
	M			src/version.h