Merge branch 'devel/master' into devel/new_vr 27/92627/1 devel/new_vr
authorTom Robinson <tom.robinson@samsung.com>
Mon, 17 Oct 2016 15:22:09 +0000 (16:22 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Mon, 17 Oct 2016 15:22:09 +0000 (16:22 +0100)
commitb37a2716ffcd268426ed530ddd2d45a78487df0a
tree13ecd14d34e26c6f1705fc70907b267b83822aa8
parent1a54203a13472dd7c04453c2361734a902cd03e1
parent9cfb6b893585d671921fac5ab1130037e31ca3a4
Merge branch 'devel/master' into devel/new_vr

Change-Id: I39b149bd3deafdaaa1f002571fc087d7a2e7e83a
examples/blocks/blocks-example.cpp
examples/mesh-visual/mesh-visual-example.cpp
examples/tilt/tilt-example.cpp