Diffusion lammps 1226d999b4e4

Merge branch 'master' into lammps-icms
1226d999b4e4
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 25 2010, 16:24.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 25 2010, 16:24

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS73e6b677f5f8: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5327 f3b2605a-c512-4ea7…
rLAMMPS4d6eaa7c83fe: add ranger data to test collection.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1226d999b4e4: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 25 2010, 16:24

Merged Changes

Commit	Author	Details	Committed
73e6b677f5f8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5327 f3b2605a-c512-4ea7…	Nov 25 2010
865df6a824d7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5326 f3b2605a-c512-4ea7…	Nov 25 2010
a7ecf1785915	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5325 f3b2605a-c512-4ea7…	Nov 24 2010
182c27500037	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5324 f3b2605a-c512-4ea7…	Nov 24 2010
9e0598d91891	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5323 f3b2605a-c512-4ea7…	Nov 24 2010
f3f2d08e11db	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5321 f3b2605a-c512-4ea7…	Nov 24 2010
5d199c90cd8d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5320 f3b2605a-c512-4ea7…	Nov 24 2010
509fe6fe17cb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5319 f3b2605a-c512-4ea7…	Nov 24 2010
ab7699eecd04	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5318 f3b2605a-c512-4ea7…	Nov 24 2010
3ed80aea4d8c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5317 f3b2605a-c512-4ea7…	Nov 24 2010
38ab9087edbb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5316 f3b2605a-c512-4ea7…	Nov 24 2010
0dad5a85513b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5315 f3b2605a-c512-4ea7…	Nov 24 2010
b22df84673c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5313 f3b2605a-c512-4ea7…	Nov 24 2010
47392a29d1c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5312 f3b2605a-c512-4ea7…	Nov 24 2010
c0497703c113	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5310 f3b2605a-c512-4ea7…	Nov 24 2010
34d0dbea1b36	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5309 f3b2605a-c512-4ea7…	Nov 24 2010
df96ce17b599	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5308 f3b2605a-c512-4ea7…	Nov 24 2010
a71cc659fa3a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5307 f3b2605a-c512-4ea7…	Nov 24 2010
a029b1d9f589	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5306 f3b2605a-c512-4ea7…	Nov 24 2010
f830e06f4b81	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5304 f3b2605a-c512-4ea7…	Nov 24 2010
2bf2afd6fa7e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5303 f3b2605a-c512-4ea7…	Nov 24 2010
2de8e4d51d4e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5302 f3b2605a-c512-4ea7…	Nov 24 2010
0d9d109d49e8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5300 f3b2605a-c512-4ea7…	Nov 24 2010
5dbc9fa8553f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5299 f3b2605a-c512-4ea7…	Nov 24 2010
ae756d8dadcd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5297 f3b2605a-c512-4ea7…	Nov 24 2010
6ae9bff1fb76	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5296 f3b2605a-c512-4ea7…	Nov 24 2010
703bb4b479dc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5294 f3b2605a-c512-4ea7…	Nov 24 2010
d9b78fef1096	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5293 f3b2605a-c512-4ea7…	Nov 24 2010

Changes (39)

				Path
	M			doc/JPG/screenshot_atomeye_small.jpg
	M			doc/JPG/screenshot_gl_small.jpg
	M			doc/JPG/screenshot_pymol_small.jpg
	A			doc/JPG/screenshot_vmd.jpg
	A			doc/JPG/screenshot_vmd_small.jpg
	M			doc/Section_python.html
	M			doc/Section_python.txt
	M			doc/fix_nh.html
	M			doc/fix_nh.txt
	M			doc/fix_rigid.html
	M			doc/fix_rigid.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			python/examples/pizza/vmd.py
	M			python/examples/viz_atomeye.py
	M			python/examples/viz_gl.py
	M			python/examples/viz_vmd.py
	M			python/examples/vizplotgui_atomeye.py
	M			python/examples/vizplotgui_gl.py
	P			python/examples/vizplotgui_pymol.py Copied to python/examples/vizplotgui_vmd.py
	P			python/examples/vizplotgui_vmd.py Copied from python/examples/vizplotgui_pymol.py
	M			src/KSPACE/pair_coul_long.cpp
	M			src/MOLECULE/angle_cosine_delta.cpp
	M			src/REPLICA/fix_neb.cpp
	M			src/REPLICA/neb.cpp
	M			src/USER-CG-CMM/cg_cmm_parms.h
	M			src/fix_nh.cpp
	M			src/fix_nh.h
	M			src/fix_rigid.h
	M			src/fix_rigid_nvt.cpp
	M			src/fix_rigid_nvt.h
	M			src/group.cpp
	M			src/group.h
	M			src/pair_coul_cut.cpp
	M			src/variable.cpp
	M			src/version.h
	M			tools/restart2data.cpp
	M			tools/vim/README.txt
	M			tools/vim/lammps.vim