Merge branch 'lammps-icms' into lammps-molfile
b0b95ee41a0d
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 23 2012, 02:01.

Description

Merge branch 'lammps-icms' into lammps-molfile

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 23 2012, 02:01

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSb0b95ee41a0d: Merge branch 'lammps-icms' into lammps-molfile (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 23 2012, 02:01

	Commit			Author	Details	Committed
	e0d696f14da4			Axel Kohlmeyer	update colvars test examples	May 23 2012
	2debba608c4c			Axel Kohlmeyer	adjust to cope with changes in LAMMPS restart code	May 22 2012

				Path
	M			examples/USER/colvars/in.peptide-colvars
	M			examples/USER/colvars/in.peptide-colvars2
	D			examples/USER/colvars/log.peptide.colvars
	D			examples/USER/colvars/log.peptide.colvars2
	D			examples/USER/colvars/log.peptide.spring
	D			examples/USER/colvars/log.peptide.spring2
	M			src/USER-COLVARS/colvarproxy_lammps.cpp