Merge "Merge branch 'devel/master' into devel/vulkan" into devel/vulkan
authorFrancisco Santos <eggzcape@gmail.com>
Tue, 6 Jun 2017 12:23:29 +0000 (08:23 -0400)
committerGerrit Code Review <support@gerrithub.io>
Tue, 6 Jun 2017 12:23:29 +0000 (08:23 -0400)
commit060cb1615f4e64ecebb7ce5d52f55dd701247099
tree7886444e7f07fc4fc6cbb31af9515e7505836e00
parent58e65fb09a363549bba1f7c5df2cf244889927b0
parent667ceb332935f1bc171e398c5f3ac908d00ace56
Merge "Merge branch 'devel/master' into devel/vulkan" into devel/vulkan