auto merge of #749 : metajack/servo/pliu6-master, r=metajack,me

Most work done by @pliu6

Supercedes #737
This commit is contained in:
bors-servo 2013-08-20 14:03:42 -07:00
commit 02e7899fb4
4 changed files with 6 additions and 1 deletions

3
.gitmodules vendored
View file

@ -103,3 +103,6 @@
[submodule "src/support/png/rust-png"]
path = src/support/png/rust-png
url = https://github.com/mozilla-servo/rust-png.git
[submodule "src/support/png/libpng"]
path = src/support/png/libpng
url = https://github.com/mozilla-servo/libpng.git

1
configure vendored
View file

@ -420,6 +420,7 @@ CFG_SUBMODULES="\
support/spidermonkey/mozjs \
support/spidermonkey/rust-mozjs \
support/stb-image/rust-stb-image \
support/png/libpng \
support/png/rust-png \
support/wapcaplet/libwapcaplet \
support/wapcaplet/rust-wapcaplet"

@ -0,0 +1 @@
Subproject commit bda7eca7c3962caadf1c25dac215519b8935b22f

@ -1 +1 @@
Subproject commit 1d014441ff8100e79521de42cb25300ed4092372
Subproject commit d01eb726c0dcd46d71611e524ede00d28f382f29