aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/script.rs
diff options
context:
space:
mode:
authorbors-servo <release+servo@mozilla.com>2014-02-24 20:01:39 -0500
committerbors-servo <release+servo@mozilla.com>2014-02-24 20:01:39 -0500
commitdf993fdaf3c1c031154389a0832914d133bc722a (patch)
tree490a4e28d74ee67ccba2a7b116da3311cbe1e66f /src/components/script/script.rs
parent998710d907964da4d39d80075dc45171ce3adabe (diff)
parent232ca597089cff647fcdef2a3cfd2030393ba84b (diff)
downloadservo-df993fdaf3c1c031154389a0832914d133bc722a.tar.gz
servo-df993fdaf3c1c031154389a0832914d133bc722a.zip
auto merge of #1689 : jdm/servo/unions, r=kmcallister
Seven hours on a train without internet will do this to you. Fixes #541.
Diffstat (limited to 'src/components/script/script.rs')
-rw-r--r--src/components/script/script.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/script/script.rs b/src/components/script/script.rs
index 8cfbc737255..1d23dfc3402 100644
--- a/src/components/script/script.rs
+++ b/src/components/script/script.rs
@@ -40,6 +40,8 @@ pub mod dom {
pub mod PrototypeList;
pub mod RegisterBindings;
pub mod BindingDeclarations;
+ pub mod UnionConversions;
+ pub mod UnionTypes;
}
}