Merge master -> master_vca_intg 17/1017/1
authorKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Wed, 25 Jan 2017 15:50:30 +0000 (10:50 -0500)
committerKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Wed, 25 Jan 2017 15:50:30 +0000 (10:50 -0500)
commit266adb435d7a60ae758efb28614c80d24c05fbba
tree9317ff16125bc1f3a148048d9eeb53ce4ffbbd05
parent7a485f58714f7271c9e06782aea598fb4545025f
parentd3b3a1c5d521361bfa40dbdec779495eb2bfd8a0
Merge master -> master_vca_intg

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
skyquake/plugins/composer/api/composer.js
skyquake/plugins/composer/src/src/components/CanvasPanel.js
skyquake/plugins/composer/src/src/libraries/model/DescriptorModelFields.js
skyquake/plugins/composer/src/src/stores/ComposerAppStore.js