Diffusion lammps f0d30951267c

Merge branch 'merge_oct23_2015' into lammps-icms
f0d30951267c
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 23 2015, 01:55.

Description

Merge branch 'merge_oct23_2015' into lammps-icms

Resolved Conflicts:
src/molecule.h
src/respa.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 23 2015, 01:55

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS09187ebabdf1: anticipate the upcoming 23 oct 2015 patch
rLAMMPSec72e316c165: remove double bugfix

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf0d30951267c: Merge branch 'merge_oct23_2015' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 23 2015, 01:55

Merged Changes

	Commit			Author	Details	Committed
	09187ebabdf1			Axel Kohlmeyer	anticipate the upcoming 23 oct 2015 patch	Oct 23 2015

Changes (9)

				Path
	M			src/USER-INTEL/fix_intel.cpp
	M			src/atom.cpp
	M			src/atom.h
	M			src/molecule.cpp
	M			src/molecule.h
	M			src/read_data.cpp
	M			src/read_data.h
	M			src/respa.cpp
	M			src/version.h

rLAMMPSf0d30951267c

View Options

src/USER-INTEL/fix_intel.cpp

View Options

src/atom.cpp

View Options

src/atom.h

View Options

src/molecule.cpp

View Options

src/molecule.h

View Options

src/read_data.cpp

View Options

src/read_data.h

View Options

src/respa.cpp

View Options

Merge branch 'merge_oct23_2015' into lammps-icmsf0d30951267cActions

Description

Details

Event Timeline

Merged Changes

Changes (9)

rLAMMPSf0d30951267c

src/USER-INTEL/fix_intel.cpp

src/atom.cpp

src/atom.h

src/molecule.cpp

src/molecule.h

src/read_data.cpp

src/read_data.h

src/respa.cpp

src/version.h

Merge branch 'merge_oct23_2015' into lammps-icms
f0d30951267c
Actions