Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
99d694e5d5b4
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 26 2015, 12:42.

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>

Mar 26 2015, 12:42

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
1f6a1f4ad4f1	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13298 f3b2605a-c512-4ea7…	Mar 25 2015
4d2f68754f73	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13297 f3b2605a-c512-4ea7…	Mar 25 2015
226918ea771a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13295 f3b2605a-c512-4ea7…	Mar 25 2015
f542af366440	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13294 f3b2605a-c512-4ea7…	Mar 25 2015
aa1fbfb1cffa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13293 f3b2605a-c512-4ea7…	Mar 25 2015
42323f487c3e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13292 f3b2605a-c512-4ea7…	Mar 25 2015
f07750fa88ae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13291 f3b2605a-c512-4ea7…	Mar 25 2015
b977c7a13b4b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13290 f3b2605a-c512-4ea7…	Mar 25 2015
1576e7d57c44	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13289 f3b2605a-c512-4ea7…	Mar 25 2015
cecf1b4ae6d1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13288 f3b2605a-c512-4ea7…	Mar 25 2015
646c13d22ec0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13287 f3b2605a-c512-4ea7…	Mar 25 2015
66b96690aec3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13286 f3b2605a-c512-4ea7…	Mar 25 2015
c3b10e024bc0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13285 f3b2605a-c512-4ea7…	Mar 25 2015

				Path
	M			doc/Manual.html
	M			doc/Manual.pdf
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_errors.html
	M			doc/Section_errors.txt
	A			doc/compute_angmom_chunk.html
	A			doc/compute_angmom_chunk.txt
	A			doc/compute_omega_chunk.html
	A			doc/compute_omega_chunk.txt
	M			doc/read_restart.html
	M			doc/read_restart.txt
	M			src/KSPACE/ewald_disp.h
	M			src/MC/fix_gcmc.cpp
	M			src/MC/fix_gcmc.h
	M			src/RIGID/fix_rattle.cpp
	M			src/RIGID/fix_rattle.h
	P			src/compute_angmom_chunk.cpp Copied from src/compute_torque_chunk.cpp
	A			src/compute_angmom_chunk.h
	P			src/compute_omega_chunk.cpp Copied from src/compute_torque_chunk.cpp
	A			src/compute_omega_chunk.h
	P			src/compute_torque_chunk.cpp Copied to multiple locations: src/compute_angmom_chunk.cpp src/compute_omega_chunk.cpp
	M			src/kspace.h
	M			src/version.h