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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 2 2015, 19:28.

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>

Apr 2 2015, 19:28

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
fc790f1b3592	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13366 f3b2605a-c512-4ea7…	Apr 2 2015
45cc91d0a146	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13365 f3b2605a-c512-4ea7…	Apr 2 2015
7f9795abef7f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13364 f3b2605a-c512-4ea7…	Apr 2 2015
440ce63ec7b3	stamoor	Fixing memory error	Apr 2 2015
c01a3b8675bf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13361 f3b2605a-c512-4ea7…	Apr 1 2015
f3b4c107b17d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13360 f3b2605a-c512-4ea7…	Apr 1 2015
d2d6d383693c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13359 f3b2605a-c512-4ea7…	Apr 1 2015
cd6f885c6d2b	stamoor	Fixing memory error	Apr 1 2015
9127ac0d5ba7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13357 f3b2605a-c512-4ea7…	Apr 1 2015
144780f673b8	stamoor	Fixing memory error	Apr 1 2015
61e93e53fc7d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13355 f3b2605a-c512-4ea7…	Apr 1 2015
dc53071b60e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13354 f3b2605a-c512-4ea7…	Apr 1 2015
d497d6593084	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13353 f3b2605a-c512-4ea7…	Apr 1 2015

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			src/ASPHERE/compute_temp_asphere.cpp
	M			src/CORESHELL/compute_temp_cs.cpp
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid.h
	M			src/RIGID/fix_rigid_small.cpp
	M			src/SHOCK/fix_msst.cpp
	M			src/SHOCK/fix_nphug.cpp
	M			src/SNAP/pair_snap.cpp
	M			src/USER-EFF/compute_temp_deform_eff.cpp
	M			src/USER-EFF/compute_temp_eff.cpp
	M			src/USER-EFF/compute_temp_region_eff.cpp
	M			src/USER-MISC/compute_temp_rotate.cpp
	M			src/compute.h
	M			src/compute_temp.cpp
	M			src/compute_temp_chunk.cpp
	M			src/compute_temp_com.cpp
	M			src/compute_temp_deform.cpp
	M			src/compute_temp_partial.cpp
	M			src/compute_temp_profile.cpp
	M			src/compute_temp_ramp.cpp
	M			src/compute_temp_region.cpp
	M			src/compute_temp_sphere.cpp
	M			src/fix_property_atom.cpp
	M			src/molecule.cpp
	M			src/version.h