Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

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

Snippets Groups Projects

8c497208

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

Commit 8c497208 authored 7 years ago by Giovanni Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge branch 'master' into v2.4-c++11

parents da3a60ba 063eb726

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 1 addition, 1 deletion

.travis.yml
CHANGES/v2.4.md 1 addition, 0 deletions

CHANGES/v2.4.md
regtest/basic/rt13-lepton/plumed.dat 1 addition, 1 deletion

regtest/basic/rt13-lepton/plumed.dat
regtest/basic/rt20b-lepton/plumed.dat 1 addition, 1 deletion

regtest/basic/rt20b-lepton/plumed.dat
src/bias/MaxEnt.cpp 28 additions, 25 deletions

src/bias/MaxEnt.cpp
src/eds/EDS.cpp 2 additions, 0 deletions

src/eds/EDS.cpp
src/function/Matheval.cpp 26 additions, 0 deletions

src/function/Matheval.cpp
src/tools/SwitchingFunction.cpp 2 additions, 2 deletions

src/tools/SwitchingFunction.cpp
user-doc/bibliography.bib 12 additions, 0 deletions

user-doc/bibliography.bib

with 74 additions and 30 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