colvars/colvars — pull request #12 by akohlmey (2013-06-19 11:09:05+00:00)
Title: Reset masses

Ok. this is more for practicing how to merge with other people. i envision that in the future non-maintenance development will be done on a feature branch like this one and then we can see how we handle the merge.
This looks safe to merge after giacomo confirmed no conflicts with NAMD, so i'm just going to merge it right away.
In the future i will set up the pull request first and then open it for discussion.