Merge pull request #452 from metajack/reorg-fixups

Reorg fixups
This commit is contained in:
Patrick Walton 2013-05-15 18:14:12 -07:00
commit 1135b0da2d
18 changed files with 23 additions and 25 deletions

12
.gitignore vendored
View file

@ -16,9 +16,9 @@ config.mk
config.stamp
config.tmp
parser.out
src/servo/dom/bindings/codegen/*.rs
src/servo/dom/bindings/codegen/_cache/
src/servo/dom/bindings/codegen/test/*.rs
src/servo/dom/bindings/codegen/PrototypeList.h
src/servo/dom/bindings/codegen/UnionTypes.h
src/servo/dom/bindings/codegen/UnionConversions.h
src/components/servo/dom/bindings/codegen/*.rs
src/components/servo/dom/bindings/codegen/_cache/
src/components/servo/dom/bindings/codegen/test/*.rs
src/components/servo/dom/bindings/codegen/PrototypeList.h
src/components/servo/dom/bindings/codegen/UnionTypes.h
src/components/servo/dom/bindings/codegen/UnionConversions.h

4
.gitmodules vendored
View file

@ -52,8 +52,8 @@
[submodule "src/support/wapcaplet/libwapcaplet"]
path = src/support/wapcaplet/libwapcaplet
url = https://github.com/mozilla-servo/libwapcaplet.git
[submodule "src/support/css/libcss"]
path = src/support/css/libcss
[submodule "src/support/netsurfcss/libcss"]
path = src/support/netsurfcss/libcss
url = https://github.com/mozilla-servo/libcss.git
[submodule "src/support/netsurfcss/rust-netsurfcss"]
path = src/support/netsurfcss/rust-netsurfcss

View file

@ -123,8 +123,6 @@ DEPS_SUBMODULES =
$(foreach submodule,$(SUBMODULES),\
$(eval $(call DEF_SUBMODULE_VARS,$(submodule))))
$(info $(DEPS_SUBMODULES))
# include submodule dependencies configuration
include $(S)mk/sub.mk

View file

@ -12,7 +12,7 @@ use core::cell::Cell;
use core::comm::{Chan, Port, SharedChan, stream};
use core::task::spawn;
use core::to_str::ToStr;
use core::util::{replace, swap};
use core::util::replace;
use std::arc::ARC;
use std::net::url::Url;

@ -1 +1 @@
Subproject commit 9224437bddb4bf2ce805e1f11ebaa8574572e32e
Subproject commit c5364d91461c2f329feada422205b8326366fa3a

@ -1 +1 @@
Subproject commit 4c934355e4e3f6be53dafcbc547217649e368a57
Subproject commit 0ac7b8dc20c4142ac6ad4500d7ae90c2bd3e7424

@ -1 +1 @@
Subproject commit 43d30dfc5db1a467b5dc64e889ce43fc82cd2248
Subproject commit 61c99b4b1aa8653b8ee8511b6c15099de441ac44

@ -1 +1 @@
Subproject commit 2053bc421acbac9847905323dd1d28e4ce357ab8
Subproject commit 40b2a4eaf80287a4c4727b97313151705b4f04c6

@ -1 +1 @@
Subproject commit e57128019bb804ec99ef1d6cebd57f5e6c221a3e
Subproject commit 98e2d7e3870759fe91c93ba520452a700fec8756

@ -1 +1 @@
Subproject commit f1ea3b16a8829d07853178ba5312176a8e854efc
Subproject commit 9ee743c1badb904adcfdf6ff3ebd100797b68ab5

@ -1 +1 @@
Subproject commit 6edd359ca41600e8c1ef9de198a578a04b2d625e
Subproject commit aaa25872d7f6ba5eb4c61651f369d8d06e759d87

@ -1 +1 @@
Subproject commit 1b06c674e794cea44e5e248f4738cb50268d8bc7
Subproject commit 611df70c7ac8172323828be1107c9df826d87a0d

@ -1 +1 @@
Subproject commit ec3680a7cb5fae54d7d6bf323b8b6676d650b82a
Subproject commit 57f9a20399ebdb664f1a8bd1950c2bcf1e66793f

@ -1 +1 @@
Subproject commit a0ddd23dbd59104cfde5911a043a73cda33dd810
Subproject commit 60036bce5d9962777467b6763c8642d9ce294cc7

@ -1 +1 @@
Subproject commit 18b768b6a786148d466f26c480ee35a7043d6909
Subproject commit d722188de3876ed748382965eb4f300fc1b78bf8

@ -1 +1 @@
Subproject commit ef012c6b703510b6c7533d38d82a46dbf37759ee
Subproject commit 01a90ed6771560ef4a84c42c0419c3e7e3b21abb

@ -1 +1 @@
Subproject commit a27dc42bdcfec4b1fdca6581afe986e71c8de99c
Subproject commit 481eb530ba2a898cbf6e2e2b4db03ca7f328bf17

@ -1 +1 @@
Subproject commit ead67f1ed72c82cfaeeb0ec1703b94d186078e5c
Subproject commit cd04bcfffe3a1846096f97c5db1c158587a60451