git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12648 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12649 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12650 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12651 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12652 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12653 f3b2605a-c512-4ea7-a41b-209d697bcdaa
another day, another colvars update
import last night's colvars updates
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	lib/colvars/colvar.cpp
	lib/colvars/colvar.h
	lib/colvars/colvaratoms.cpp
	lib/colvars/colvarbias.cpp
	lib/colvars/colvarbias.h
	lib/colvars/colvarbias_abf.cpp
	lib/colvars/colvarbias_abf.h
	lib/colvars/colvarcomp.cpp
	lib/colvars/colvarcomp.h
	lib/colvars/colvarcomp_distances.cpp
	lib/colvars/colvargrid.h
	lib/colvars/colvarmodule.cpp
	lib/colvars/colvarmodule.h
	lib/colvars/colvarproxy.h
	lib/colvars/colvartypes.h
	lib/cuda/Makefile.lammps
	src/USER-COLVARS/fix_colvars.cpp
cosmetic change
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12655 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12656 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12658 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12659 f3b2605a-c512-4ea7-a41b-209d697bcdaa
update colvars library one more time
safer parsing of force field data
fix file handle leak
update proxy revision id
update reference log file for colvars examples
remove unused makefile