Merge branch 'master' into jbolz_push_constants
authorJeff Bolz <jbolz@nvidia.com>
Sun, 27 Dec 2015 21:07:49 +0000 (21:07 +0000)
committerJeff Bolz <jbolz@nvidia.com>
Sun, 27 Dec 2015 21:07:49 +0000 (21:07 +0000)
commit27b3919f3d89770d755d64878242489f5da174c6
treee1e1f4a94bd672483fea2f7ca39d5ee94ab40845
parente3ae9d5ba41a56a73e95136a7fdabbed1d5b05c3
parentba7bce2ff0d25d66d393328c64480f8569de0967
Merge branch 'master' into jbolz_push_constants