Merge branch 'devel/master' into devel/vulkan
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 5 Jun 2017 16:27:25 +0000 (17:27 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 5 Jun 2017 16:27:25 +0000 (17:27 +0100)
commit5899611f7bc6ca8cc018a23956861317362fd0ea
tree812fdc81326462f45bbd94b9381bfec5ac088629
parentb51441a5e5fe832e42989109f4a33dcd81336346
parent4d7f29e0813d444d9a46cae690d053c443c72fcf
Merge branch 'devel/master' into devel/vulkan