Merge branch 'cts_mlentine' into 'master'
authorPyry Haulos <phaulos@google.com>
Wed, 25 Nov 2015 01:57:43 +0000 (20:57 -0500)
committerPyry Haulos <phaulos@google.com>
Wed, 25 Nov 2015 01:57:43 +0000 (20:57 -0500)
commit3f8ea0ecf37caa45a0b8d8b7a12d41f1f6ea3eb7
tree025f2929746bebaaabe222d3394915be6b74ccef
parent434b6ef7a024b08c6f0fae1c02e90a365b56a335
parent4a2664715d41756c615c0fc3e42ffb3ddad3b754
Merge branch 'cts_mlentine' into 'master'

Fix sType for vertex assembly in object management tests.

See merge request !77