Merge branch 'master' into openmp-master
c428171b86c4
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 22 2011, 18:04.

Description

Merge branch 'master' into openmp-master

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Dec 22 2011, 18:04

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc428171b86c4: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 22 2011, 18:04

	Commit			Author	Details	Committed
	9921d2078894			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7381 f3b2605a-c512-4ea7…	Dec 19 2011
	5a644b0e5de4			athomps	Added protection for zero atoms case	Dec 19 2011

				Path
	M			src/fix_nh.cpp
	M			src/version.h