Merging master to master_vca_intg
authorKiran Kashalkar <kiran.kashalkar@riftio.com>
Thu, 23 Feb 2017 10:48:18 +0000 (10:48 +0000)
committerKiran Kashalkar <kiran.kashalkar@riftio.com>
Thu, 23 Feb 2017 10:48:18 +0000 (10:48 +0000)
commit6620bca06b9874e68e8bc11ce28b7a6eeda5cc03
tree9b86e80b04f9cbd8040a0eda08bf549c399a7178
parent12e305918188d2eb4f3b2eb33e325a02d3866405
parent625a4c2118c4d095daf2a264643798eddf4d0491
Merging master to 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/components/EditDescriptorModelProperties.js
skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js
skyquake/plugins/composer/src/src/libraries/utils.js