Merge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point
authorJim Morris <morris@wolfman.com>
Sun, 19 Mar 2017 01:58:20 +0000 (18:58 -0700)
committerJim Morris <morris@wolfman.com>
Sun, 19 Mar 2017 01:58:20 +0000 (18:58 -0700)
commitc557b5b3cf9fbb3e4ccd9fa6fd18657c92da5795
tree1c8ed47da7ba7040da378dfccfeeb6c2cb0ec1ee
parent7671f21c46085c932b3e2d65c3763e2de325b1b2
parent0c9209ad26c39bf3a719c69b3ec83b97034c3db7
Merge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point