Merge branch 'devel/master' into devel/vulkan
authorFrancisco Santos <f1.santos@samsung.com>
Tue, 14 Nov 2017 15:29:50 +0000 (15:29 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Tue, 14 Nov 2017 15:29:50 +0000 (15:29 +0000)
commit02a8a3d3de0c152eb659a83f02436cb84e6f0b95
treea27691239ae5bae5c83e77bd7af12c15dd3e615e
parent1c2e0adc445c799c39e309544a6637c66abff684
parent18feedecd0f60aa1a42a4c9f695181e266bc2d37
Merge branch 'devel/master' into devel/vulkan