diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2010-08-10 13:26:00 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2010-08-10 13:26:00 -0700 |
| commit | dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec (patch) | |
| tree | c5f89fa72e9c28ced0a533a498d64eee30f26f3f /src/Makefile | |
| parent | 75e46cc4d0fbd8f1a1c4676931119a858fafeacf (diff) | |
| parent | b71340552fa0caa870877f87a1273e8d4c91efe6 (diff) | |
| download | rust-dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec.tar.gz rust-dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec.zip | |
Merge commit 'jyasskin/work'
Conflicts: src/rt/rust_dom.cpp src/rt/rust_upcall.cpp
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 38327b6b6b6..496457bb067 100644 --- a/src/Makefile +++ b/src/Makefile @@ -472,7 +472,6 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ i32-sub.rs \ i8-incr.rs \ import.rs \ - inner-module.rs \ integral-indexing.rs \ int-lib.rs \ iter-range.rs \ |