Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

openstructure
- Activity
- Members

Snippets Groups Projects

3780482c

Commit 3780482c authored 7 years ago by Rafal Gumienny

Downloads
- Plain Diff

Merge branch 'develop' into Molck-SCHWED-3126

parents 1ba2f89e 1e3578ba

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.txt 10 additions, 1 deletion

CHANGELOG.txt
CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
modules/io/src/mol/star_parser.cc 4 additions, 0 deletions

modules/io/src/mol/star_parser.cc
modules/io/tests/test_star_parser.cc 14 additions, 0 deletions

modules/io/tests/test_star_parser.cc
modules/io/tests/testfiles/broken_data.cif 1 addition, 0 deletions

modules/io/tests/testfiles/broken_data.cif
modules/io/tests/testfiles/broken_global.cif 1 addition, 0 deletions

modules/io/tests/testfiles/broken_global.cif
modules/mol/base/doc/entity.rst 3 additions, 1 deletion

modules/mol/base/doc/entity.rst

with 34 additions and 3 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