Merge commit '0c99b900d874b60ce89b94742b2215f163c87a2b'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 13:01:43 +0000 (10:01 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 13:01:43 +0000 (10:01 -0300)
commit87681ba97b707e460af266d5a1ff89e32a3184ef
tree6c00b0f1bc18f228353663e244862085f1544a7c
parentbdbf14abba9d1fb99b63cdaabf4bba074a36ea2f
parent0c99b900d874b60ce89b94742b2215f163c87a2b
Merge commit '0c99b900d874b60ce89b94742b2215f163c87a2b'

* commit '0c99b900d874b60ce89b94742b2215f163c87a2b':
  png: Support RGBA64 pixel format

This commit is a noop, see 97da38c99bf5ad619ea15f2f1b4c050f0f44d11f

Merged-by: James Almer <jamrial@gmail.com>