Merge branch 'master' into 117-push-constant-wrong-glsl
authorJeff Bolz <jbolz@nvidia.com>
Tue, 22 Dec 2015 14:57:40 +0000 (14:57 +0000)
committerJeff Bolz <jbolz@nvidia.com>
Tue, 22 Dec 2015 14:57:40 +0000 (14:57 +0000)
commitc53d9685e4b64ab07348edcc65ebb13d59cca8d0
tree801f893f9bedce62b9fe4dc22041dc05be27ce09
parent1e199b01f1f676e56bfaab431dd13def0a773baf
parentc4a14b22e2b4a42c847e2e3e669631e8d876cd52
Merge branch 'master' into 117-push-constant-wrong-glsl