Merge branch 'master' into lammps-icms
4055b29e10e6
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 23 2012, 23:38.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 23 2012, 23:38

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS4055b29e10e6: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 23 2012, 23:38

Commit	Author	Details	Committed
e7611d421f60	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8386 f3b2605a-c512-4ea7…	Jun 23 2012
8f68628a20f8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8385 f3b2605a-c512-4ea7…	Jun 22 2012
b33ba405a3b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8382 f3b2605a-c512-4ea7…	Jun 22 2012

				Path
	M			doc/fix_balance.html
	M			doc/fix_balance.txt
	M			src/GRANULAR/pair_gran_hertz_history.cpp
	M			src/GRANULAR/pair_gran_hooke.cpp
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/GRANULAR/pair_gran_hooke_history.h
	M			src/fix_rigid.h
	M			src/version.h