Merge remote branch 'lammps-ro/master' into lammps-icms
f7c48d0ee3fd
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 30 2013, 13:28.

Description

Merge remote branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
src/Package.sh

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 30 2013, 13:28

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf7c48d0ee3fd: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 30 2013, 13:28

	Commit			Author	Details	Committed
	eee6f75bc9bf			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9932 f3b2605a-c512-4ea7…	May 29 2013
	61213fbfb69d			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9931 f3b2605a-c512-4ea7…	May 29 2013

				Path
	M			src/Package.sh
	A			src/USER-OMP/Package.sh