src/mol-model/structure/model/formats/mmcif.ts · 9b1c299da8edd4ae885699e9c7f4a89a304b9fe1 · Michal Malý / Molstar

6 years ago

Merge branch 'master' into bond-repr · 1c0043b7

Alexander Rose authored 6 years ago

# Conflicts:
#	src/apps/structure-info/model.ts
#	src/mol-geo/theme/structure/color/chain-id.ts
#	src/mol-model/structure/model/model.ts
#	src/mol-model/structure/structure/structure.ts

1c0043b7

History

Merge branch 'master' into bond-repr

Alexander Rose authored 6 years ago

# Conflicts:
#	src/apps/structure-info/model.ts
#	src/mol-geo/theme/structure/color/chain-id.ts
#	src/mol-model/structure/model/model.ts
#	src/mol-model/structure/structure/structure.ts