Merge branch 'master' of https://github.com/molstar/molstar-proto
# Conflicts: # src/mol-plugin/ui/controls/parameters.tsx
No related branches found
No related tags found
Showing
- src/mol-canvas3d/canvas3d.ts 4 additions, 4 deletionssrc/mol-canvas3d/canvas3d.ts
- src/mol-plugin/ui/controls/parameters.tsx 44 additions, 23 deletionssrc/mol-plugin/ui/controls/parameters.tsx
- src/mol-plugin/ui/state/apply-action.tsx 2 additions, 2 deletionssrc/mol-plugin/ui/state/apply-action.tsx
- src/mol-plugin/ui/state/update-transform.tsx 2 additions, 2 deletionssrc/mol-plugin/ui/state/update-transform.tsx
- src/mol-plugin/ui/viewport.tsx 5 additions, 5 deletionssrc/mol-plugin/ui/viewport.tsx
- src/mol-util/memoize.ts 11 additions, 1 deletionsrc/mol-util/memoize.ts
Loading
Please register or sign in to comment