Skip to content
Snippets Groups Projects
Select Git revision
  • rednatco
  • master default protected
  • ntc-tube-uniform-color
  • ntc-tube-missing-atoms
  • restore-vertex-array-per-program
  • watlas2
  • dnatco_new
  • cleanup-old-nodejs
  • webmmb
  • fix_auth_seq_id
  • update_deps
  • ext_dev
  • ntc_balls
  • nci-2
  • plugin
  • bugfix-0.4.5
  • nci
  • servers
  • mol-model
  • mol-script
  • v0.5.0-dev.1
  • v0.4.5
  • v0.4.4
  • v0.4.3
  • v0.4.2
  • v0.4.1
  • v0.4.0
  • v0.3.12
  • v0.3.11
  • v0.3.10
  • v0.3.9
  • v0.3.8
  • v0.3.7
  • v0.3.6
  • v0.3.5
  • v0.3.4
  • v0.3.3
  • v0.3.2
  • v0.3.1
  • v0.3.0
40 results
Blame Permalink
  • Alexander Rose's avatar
    63a9b680
    Merge branch 'master' into cartoon-repr · 63a9b680
    Alexander Rose authored 
    # Conflicts:
#	src/mol-data/int/impl/segmentation.ts
#	src/mol-data/int/segmentation.ts
#	src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts
#	src/mol-geo/representation/structure/visual/util/polymer.ts
#	src/mol-model/structure/model/formats/mmcif.ts
#	src/mol-model/structure/model/formats/mmcif/atomic.ts
#	src/mol-model/structure/model/formats/mmcif/ihm.ts
#	src/mol-model/structure/model/properties/atomic/hierarchy.ts
#	src/mol-model/structure/model/properties/coarse/hierarchy.ts
    63a9b680
    History
    Merge branch 'master' into cartoon-repr
    Alexander Rose authored 
    # Conflicts:
#	src/mol-data/int/impl/segmentation.ts
#	src/mol-data/int/segmentation.ts
#	src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts
#	src/mol-geo/representation/structure/visual/util/polymer.ts
#	src/mol-model/structure/model/formats/mmcif.ts
#	src/mol-model/structure/model/formats/mmcif/atomic.ts
#	src/mol-model/structure/model/formats/mmcif/ihm.ts
#	src/mol-model/structure/model/properties/atomic/hierarchy.ts
#	src/mol-model/structure/model/properties/coarse/hierarchy.ts