Merge branch 'master' into lammps-icms
4441f9b5aafd
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 20 2012, 15:11.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/read_dump.txt
doc/rerun.txt
lib/molfile/README
src/MOLECULE/dihedral_helix.cpp
src/USER-MOLFILE/Install.sh
src/USER-MOLFILE/README
src/create_atoms.cpp
src/read_dump.cpp
src/reader.cpp
src/reader_xyz.cpp
src/rerun.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 20 2012, 15:11

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSb96c9934caef: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8347 f3b2605a-c512-4ea7…
rLAMMPS0296f2593f6a: fix long-standing typo.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS4441f9b5aafd: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 20 2012, 15:11

Merged Changes

Commit	Author	Details	Committed
b96c9934caef	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8347 f3b2605a-c512-4ea7…	Jun 19 2012
9733df592997	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8346 f3b2605a-c512-4ea7…	Jun 19 2012
7198c2aaca71	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8344 f3b2605a-c512-4ea7…	Jun 19 2012
dc9431dcb221	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8343 f3b2605a-c512-4ea7…	Jun 19 2012
7b55b61abb74	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8342 f3b2605a-c512-4ea7…	Jun 19 2012
d2882ddaa6d8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8341 f3b2605a-c512-4ea7…	Jun 19 2012
0241b5ce29e3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8340 f3b2605a-c512-4ea7…	Jun 19 2012
df9a09506336	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8339 f3b2605a-c512-4ea7…	Jun 19 2012
8b99b249141f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8338 f3b2605a-c512-4ea7…	Jun 19 2012
f35b83be0bc7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8337 f3b2605a-c512-4ea7…	Jun 19 2012
d4c19826bac9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8336 f3b2605a-c512-4ea7…	Jun 19 2012
228e4c4514c9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8335 f3b2605a-c512-4ea7…	Jun 19 2012
e94aec42d1c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8334 f3b2605a-c512-4ea7…	Jun 19 2012
5d8c187ee805	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8333 f3b2605a-c512-4ea7…	Jun 19 2012
459ac110a80d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8332 f3b2605a-c512-4ea7…	Jun 19 2012
242315e7b40a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8331 f3b2605a-c512-4ea7…	Jun 19 2012
5747c99cd828	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8330 f3b2605a-c512-4ea7…	Jun 19 2012
b89f00596ccb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8329 f3b2605a-c512-4ea7…	Jun 19 2012
466dab27e468	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8327 f3b2605a-c512-4ea7…	Jun 19 2012
054feed381a5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8326 f3b2605a-c512-4ea7…	Jun 19 2012
a559ad0c45e5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8325 f3b2605a-c512-4ea7…	Jun 19 2012
ba6063c7a316	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8324 f3b2605a-c512-4ea7…	Jun 19 2012
7fe9d103625c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8323 f3b2605a-c512-4ea7…	Jun 19 2012
20f60d74728f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8322 f3b2605a-c512-4ea7…	Jun 19 2012
023ccd9d7c19	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8321 f3b2605a-c512-4ea7…	Jun 19 2012
3b8898e7e91d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8320 f3b2605a-c512-4ea7…	Jun 19 2012

Changes (46)

				Path
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/fix_ave_correlate.html
	M			doc/fix_ave_correlate.txt
	M			doc/fix_ave_histo.html
	M			doc/fix_ave_histo.txt
	M			doc/fix_ave_spatial.html
	M			doc/fix_ave_spatial.txt
	M			doc/fix_ave_time.html
	M			doc/fix_ave_time.txt
	M			doc/read_dump.html
	M			doc/read_dump.txt
	M			doc/rerun.html
	M			doc/rerun.txt
	M			lib/README
	D			lib/kim
	D			lib/kim/Makefile.lammps
	D			lib/kim/README
	D			lib/molfile
	D			lib/molfile/Makefile.lammps
	D			lib/molfile/README
	M			src/KIM/Install.sh
	A			src/KIM/Makefile.lammps
	M			src/MOLECULE/dihedral_helix.cpp
	M			src/USER-MOLFILE/Install.sh
	A			src/USER-MOLFILE/Makefile.lammps
	M			src/USER-MOLFILE/README
	M			src/compute_gyration.cpp
	M			src/compute_gyration_molecule.cpp
	M			src/create_atoms.cpp
	M			src/fix_ave_correlate.cpp
	M			src/fix_ave_correlate.h
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_histo.h
	M			src/fix_ave_spatial.cpp
	M			src/fix_ave_spatial.h
	M			src/fix_ave_time.cpp
	M			src/fix_ave_time.h
	M			src/modify.cpp
	M			src/pair_lj_cut.cpp
	M			src/read_dump.cpp
	M			src/reader.cpp
	M			src/reader_xyz.cpp
	M			src/rerun.cpp
	M			src/version.h
	M			tools/vim/lammps.vim