Merge branch 'lammps-icms' into lammps-colvars
295eec0a356e
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 16 2013, 11:16.

Description

Merge branch 'lammps-icms' into lammps-colvars

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 16 2013, 11:16

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS295eec0a356e: Merge branch 'lammps-icms' into lammps-colvars (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 16 2013, 11:16

Commit	Author	Details	Committed
71850a151844	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Jan 16 2013
94a21c0d3d36	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9272 f3b2605a-c512-4ea7…	Jan 15 2013
4f2bdac177d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9271 f3b2605a-c512-4ea7…	Jan 14 2013
4c71fc231141	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9270 f3b2605a-c512-4ea7…	Jan 14 2013

				Path
	M			src/ASPHERE/compute_erotate_asphere.cpp
	M			src/ASPHERE/compute_temp_asphere.cpp
	M			src/ASPHERE/fix_nh_asphere.cpp
	M			src/ASPHERE/fix_nve_asphere.cpp
	M			src/ASPHERE/fix_nve_asphere_noforce.cpp
	M			src/ASPHERE/fix_nve_line.cpp
	M			src/ASPHERE/fix_nve_tri.cpp
	M			src/ASPHERE/pair_gayberne.cpp
	M			src/ASPHERE/pair_line_lj.cpp
	M			src/ASPHERE/pair_line_lj.h
	M			src/ASPHERE/pair_resquared.cpp
	M			src/ASPHERE/pair_tri_lj.cpp
	M			src/ASPHERE/pair_tri_lj.h
	M			src/RIGID/fix_rigid.cpp
	M			src/compute_property_atom.cpp
	M			src/compute_property_atom.h
	M			src/fix_langevin.cpp