Merge branch 'steve-lunarg-intrinsic-promotion'
authorJohn Kessenich <cepheus@frii.com>
Sat, 3 Dec 2016 20:29:46 +0000 (13:29 -0700)
committerJohn Kessenich <cepheus@frii.com>
Sat, 3 Dec 2016 20:29:46 +0000 (13:29 -0700)
commit09512cbd5c7459babdf981b265910975dab7adb4
treeb29f3d183f8639695ec459dfa1ec9fe93a4eb682
parent41be1cbe4a231d6b700a4393cb0916ff4d69e614
parent21b11f4cc12aa1540976e4a1286b5d3f244b1700
Merge branch 'steve-lunarg-intrinsic-promotion'