Diffusion lammps 0fede4ae98e9

Merge branch 'lammps-icms' into lammps-molfile
0fede4ae98e9
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 14 2012, 16:40.

Description

Merge branch 'lammps-icms' into lammps-molfile

Resolved Conflicts:
src/USER-MOLFILE/README

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 14 2012, 16:40

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSdd4f21087a56: Merge branch 'master' into lammps-icms
rLAMMPSdbd988364120: more files to ignore

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS0fede4ae98e9: Merge branch 'lammps-icms' into lammps-molfile (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 14 2012, 16:40

Merged Changes

Commit	Author	Details	Committed
dd4f21087a56	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Jun 14 2012
c27af0d45893	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8284 f3b2605a-c512-4ea7…	Jun 13 2012
3a655e0533f1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8282 f3b2605a-c512-4ea7…	Jun 13 2012
99157504bbde	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8281 f3b2605a-c512-4ea7…	Jun 13 2012
8a402166696d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8280 f3b2605a-c512-4ea7…	Jun 13 2012
03967d227031	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8279 f3b2605a-c512-4ea7…	Jun 13 2012
49a004194cee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8278 f3b2605a-c512-4ea7…	Jun 13 2012
eff8d7d8c74c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8277 f3b2605a-c512-4ea7…	Jun 13 2012
82837889542d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8276 f3b2605a-c512-4ea7…	Jun 13 2012
ea82e095bc2c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8274 f3b2605a-c512-4ea7…	Jun 13 2012
9d52068131e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8273 f3b2605a-c512-4ea7…	Jun 13 2012
e8fac9300b4d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8272 f3b2605a-c512-4ea7…	Jun 13 2012
ee74e0f713d1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8271 f3b2605a-c512-4ea7…	Jun 13 2012
597dc8f9d8a3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8270 f3b2605a-c512-4ea7…	Jun 13 2012
d5b8b7531393	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8269 f3b2605a-c512-4ea7…	Jun 13 2012

Changes (29)

		Path
M		doc/Section_packages.html
M		doc/Section_packages.txt
M		doc/compute_gyration.html
M		doc/compute_gyration.txt
M		doc/compute_gyration_molecule.html
M		doc/compute_gyration_molecule.txt
P		doc/dump_molfile.html Copied from doc/dump_molfile.txt
M		doc/read_dump.txt
M		doc/rerun.txt
M		doc/variable.html
M		doc/variable.txt
M		lib/README
A	(dir)	lib/molfile/
P		lib/molfile/Makefile.lammps Copied from lib/poems/Makefile.lammps
A		lib/molfile/README
M		src/FLD/pair_lubricate.cpp
M		src/FLD/pair_lubricate_poly.cpp
M		src/Makefile
M		src/USER-MOLFILE/Install.sh
D		src/USER-MOLFILE/Makefile.lammps
M		src/USER-MOLFILE/Package.sh
M		src/USER-MOLFILE/README
M		src/compute_atom_molecule.cpp
M		src/compute_gyration.cpp
M		src/compute_gyration.h
M		src/compute_gyration_molecule.cpp
M		src/compute_gyration_molecule.h
M		src/variable.cpp
M		src/version.h