Merge branch 'master' into fermi-mods
e284b73855be
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 20 2011, 23:01.

Description

Merge branch 'master' into fermi-mods

Conflicts:
src/Makefile.package.settings

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 20 2011, 23:01

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSe284b73855be: Merge branch 'master' into fermi-mods (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 20 2011, 23:01

Commit	Author	Details	Committed
7050ed0d2898	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6746 f3b2605a-c512-4ea7…	Aug 19 2011
a2b1d577d096	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6745 f3b2605a-c512-4ea7…	Aug 19 2011
00345ef5a93b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6744 f3b2605a-c512-4ea7…	Aug 19 2011

				Path
	M			src/MOLECULE/atom_vec_full.cpp
	D			src/Makefile.package.settings
	M			src/lammps.cpp