Merge branch 'master' into lammps-icms
3930d66dfb1f
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 24 2012, 17:54.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 24 2012, 17:54

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS3930d66dfb1f: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 24 2012, 17:54

Commit	Author	Details	Committed
fdce17720328	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8996 f3b2605a-c512-4ea7…	Oct 23 2012
c524604ec794	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8995 f3b2605a-c512-4ea7…	Oct 23 2012
2c1a5cccf73b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8993 f3b2605a-c512-4ea7…	Oct 23 2012
6394161a7cd6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8992 f3b2605a-c512-4ea7…	Oct 23 2012

				Path
	M			lib/colvars/colvar.cpp
	M			lib/colvars/colvar.h
	M			lib/colvars/colvaratoms.cpp
	M			lib/colvars/colvaratoms.h
	M			lib/colvars/colvarcomp.h
	M			lib/colvars/colvarcomp_distances.cpp
	M			lib/colvars/colvarmodule.cpp
	M			lib/colvars/colvarmodule.h
	M			src/USER-MISC/fix_imd.cpp
	M			src/atom.cpp
	M			src/atom.h
	M			src/atom_map.cpp
	M			src/read_dump.cpp
	M			src/rerun.cpp
	M			src/version.h