Merge commit 'b44bd7ee7f7d834c1e22b5f33674393e5c0267c5'
authorJames Almer <jamrial@gmail.com>
Thu, 12 Oct 2017 18:03:23 +0000 (15:03 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 12 Oct 2017 18:03:23 +0000 (15:03 -0300)
* commit 'b44bd7ee7f7d834c1e22b5f33674393e5c0267c5':
  pixlet: Fix architecture-dependent code and values

This commit is a noop, see a6b1180e390925c0ceb78fd223fd18f8c1e39c94

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

Trivial merge