Merge branch 'devel/master' into devel/vulkan
authorFrancisco Santos <f1.santos@samsung.com>
Tue, 14 Nov 2017 14:13:32 +0000 (14:13 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Tue, 14 Nov 2017 14:13:32 +0000 (14:13 +0000)
commit94b2fd70d70aca58018de954b3ba468014056158
treee650eaf111886fd0f87ee920c287ec9dc013b3a0
parent4a07ebba7b48d25f6ed9f1f098598727f592a212
parentccd5e67cfebebde79b1c06d8f35ed736ec1de921
Merge branch 'devel/master' into devel/vulkan