diff options
author | Jon Reid | 2012-03-06 18:08:11 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-06 18:08:11 -0800 |
commit | a12603cfcfe9d82def3b972dcbcc80f1e790ad85 (patch) | |
tree | f52c7dcc837dd98d28f505696b67b94db15e4c63 /imports/codemirror/mode/rust/index.html | |
parent | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (diff) | |
parent | bb6a1d82b2884b410f5859cc0c2cafd380acbe6a (diff) | |
download | ninja-a12603cfcfe9d82def3b972dcbcc80f1e790ad85.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber
Diffstat (limited to 'imports/codemirror/mode/rust/index.html')
-rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/rust/index.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/imports/codemirror/mode/rust/index.html b/imports/codemirror/mode/rust/index.html index a84c61e5..3b811e35 100755..100644 --- a/imports/codemirror/mode/rust/index.html +++ b/imports/codemirror/mode/rust/index.html | |||
@@ -15,9 +15,9 @@ | |||
15 | // Demo code. | 15 | // Demo code. |
16 | 16 | ||
17 | type foo<T> = int; | 17 | type foo<T> = int; |
18 | tag bar { | 18 | enum bar { |
19 | some(int, foo<float>); | 19 | some(int, foo<float>), |
20 | none; | 20 | none |
21 | } | 21 | } |
22 | 22 | ||
23 | fn check_crate(x: int) { | 23 | fn check_crate(x: int) { |