Skip to content
Snippets Groups Projects
Commit c71aeb76 authored by Alexander Rose's avatar Alexander Rose
Browse files

Merge branch 'master' into gl-lines

# Conflicts:
#	src/mol-geo/geometry/geometry.ts
#	src/mol-geo/geometry/lines/lines.ts
#	src/mol-geo/geometry/points/points.ts
#	src/mol-repr/structure/representation/cartoon.ts
#	src/mol-repr/structure/visual/inter-unit-link-cylinder.ts
#	src/mol-repr/structure/visual/polymer-backbone-cylinder.ts
#	src/mol-repr/structure/visual/polymer-direction-wedge.ts
#	src/mol-repr/structure/visual/polymer-gap-cylinder.ts
#	src/mol-repr/structure/visual/polymer-trace-mesh.ts
#	src/mol-repr/structure/visual/util/link.ts
#	src/mol-repr/volume/index.ts
parents a3905bd4 9c348e05
No related branches found
No related tags found
No related merge requests found
Showing
with 197 additions and 86 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment