Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

Plumed AlphaFold
- Activity
- Members
- Labels
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

NOTICE: Cloning or pulling repositories in GitLab 17.11.0 over HTTPS is broken upstream, fix expected soon. Use Personal Access Tokens or SSH Keys in the meantime — additional info here.

99f2711b

There was an error fetching the commit references. Please try again later.

Commit 99f2711b authored 6 years ago by Giovanni Bussi

Downloads
- Plain Diff

Merge branch 'v2.4' into v2.5

parents 16e57621 ea652f07

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 1 addition, 1 deletion

.travis.yml
src/colvar/ContactMap.cpp 2 additions, 2 deletions

src/colvar/ContactMap.cpp
src/colvar/CoordinationBase.cpp 2 additions, 2 deletions

src/colvar/CoordinationBase.cpp
src/generic/EffectiveEnergyDrift.cpp 0 additions, 2 deletions

src/generic/EffectiveEnergyDrift.cpp
src/gridtools/GridToXYZ.cpp 2 additions, 1 deletion

src/gridtools/GridToXYZ.cpp
src/tools/Communicator.cpp 0 additions, 8 deletions

src/tools/Communicator.cpp
src/tools/HistogramBead.cpp 4 additions, 1 deletion

src/tools/HistogramBead.cpp
src/tools/IFile.cpp 6 additions, 3 deletions

src/tools/IFile.cpp
src/tools/SwitchingFunction.cpp 4 additions, 1 deletion

src/tools/SwitchingFunction.cpp
src/ves/FermiSwitchingFunction.cpp 4 additions, 1 deletion

src/ves/FermiSwitchingFunction.cpp
src/ves/MD_LinearExpansionPES.cpp 2 additions, 2 deletions

src/ves/MD_LinearExpansionPES.cpp

with 27 additions and 24 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment