Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

Molstar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4b6392d5

Commit 4b6392d5 authored 7 years ago by Alexander Rose

Downloads
- Plain Diff

Merge branch 'master' into gl-geo

# Conflicts:
#	src/mol-geo/representation/structure/index.ts

parents b8a4365d 22190c17

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/mol-geo/representation/structure/index.ts 5 additions, 9 deletions

src/mol-geo/representation/structure/index.ts
src/mol-model/structure/structure/element/group.ts 4 additions, 3 deletions

src/mol-model/structure/structure/element/group.ts
src/perf-tests/structure.ts 30 additions, 5 deletions

src/perf-tests/structure.ts

with 39 additions and 17 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