-
- Downloads
There was an error fetching the commit references. Please try again later.
Merge branch 'master' into tree-refactoring
Conflicts: src/function/FuncPathMSD.cpp src/generic/DumpDerivatives.cpp src/generic/DumpForces.cpp src/generic/DumpProjections.cpp
Showing
- src/bias/Bias.cpp 1 addition, 0 deletionssrc/bias/Bias.cpp
- src/bias/LWalls.cpp 0 additions, 1 deletionsrc/bias/LWalls.cpp
- src/bias/MovingRestraint.cpp 1 addition, 2 deletionssrc/bias/MovingRestraint.cpp
- src/bias/Ratchet.cpp 0 additions, 1 deletionsrc/bias/Ratchet.cpp
- src/bias/Restraint.cpp 3 additions, 4 deletionssrc/bias/Restraint.cpp
- src/bias/UWalls.cpp 0 additions, 1 deletionsrc/bias/UWalls.cpp
- src/bias/Value.cpp 0 additions, 1 deletionsrc/bias/Value.cpp
- src/colvar/Angle.cpp 1 addition, 2 deletionssrc/colvar/Angle.cpp
- src/colvar/ContactMap.cpp 0 additions, 1 deletionsrc/colvar/ContactMap.cpp
- src/colvar/Coordination.cpp 3 additions, 4 deletionssrc/colvar/Coordination.cpp
- src/colvar/Distance.cpp 2 additions, 2 deletionssrc/colvar/Distance.cpp
- src/colvar/Energy.cpp 2 additions, 2 deletionssrc/colvar/Energy.cpp
- src/colvar/Gyration.cpp 0 additions, 1 deletionsrc/colvar/Gyration.cpp
- src/colvar/PathMSDBase.cpp 0 additions, 1 deletionsrc/colvar/PathMSDBase.cpp
- src/colvar/PathMSDBase.h 0 additions, 1 deletionsrc/colvar/PathMSDBase.h
- src/colvar/Template.cpp 2 additions, 2 deletionssrc/colvar/Template.cpp
- src/colvar/Torsion.cpp 5 additions, 4 deletionssrc/colvar/Torsion.cpp
- src/colvar/Volume.cpp 0 additions, 1 deletionsrc/colvar/Volume.cpp
- src/function/Combine.cpp 5 additions, 3 deletionssrc/function/Combine.cpp
- src/function/FuncPathMSD.cpp 0 additions, 2 deletionssrc/function/FuncPathMSD.cpp
Loading
Please register or sign in to comment