Auto merge of #6357 - ecoal95:more-webgl, r=pcwalton

See the commit descriptions for more details. 

Blocked on https://github.com/servo/gleam/pull/24

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6357)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-13 15:05:08 -06:00
commit ceaca2e288
16 changed files with 679 additions and 353 deletions

View file

@ -465,7 +465,7 @@ dependencies = [
[[package]]
name = "gleam"
version = "0.0.1"
source = "git+https://github.com/servo/gleam#98f889861aa1c8dee088ac751ab03ca639715bbe"
source = "git+https://github.com/servo/gleam#0108e2a6c7ca4dc471bfb94ba1ed368335e4da28"
dependencies = [
"gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_generator 0.0.26 (registry+https://github.com/rust-lang/crates.io-index)",