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

233fcb5d

Commit 233fcb5d authored 6 years ago by Alexander Rose

Downloads
- Plain Diff

Merge branch 'master' into gl-lines# Conflicts:# src/mol-util/param-definition.ts

parents 6a42580f bd9177cd

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-math/linear-algebra/3d/vec2.ts 4 additions, 0 deletions

src/mol-math/linear-algebra/3d/vec2.ts
src/mol-plugin/ui/controls/parameters.tsx 1 addition, 1 deletion

src/mol-plugin/ui/controls/parameters.tsx
src/mol-util/param-definition.ts 46 additions, 2 deletions

src/mol-util/param-definition.ts

with 51 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