diff options
author | Araq <rumpf_a@web.de> | 2013-12-05 00:03:27 +0100 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2013-12-05 00:03:27 +0100 |
commit | 5eba93d584d5446256d05f0eef111ace5e12bac3 (patch) | |
tree | 7b638031f3e77c16ca0c27b9c83630d78846f19e /config/nimrod.cfg | |
parent | 9035d15ed22de1f80486d94ec63e720a4d04cbc0 (diff) | |
parent | 2264875237cb72cf0288f2bd3d4a930c2a1acc50 (diff) | |
download | Nim-5eba93d584d5446256d05f0eef111ace5e12bac3.tar.gz |
Merge branch 'master' into vm2
Conflicts: compiler/sem.nim
Diffstat (limited to 'config/nimrod.cfg')
-rw-r--r-- | config/nimrod.cfg | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/nimrod.cfg b/config/nimrod.cfg index fbbf8efbb..2817eac55 100644 --- a/config/nimrod.cfg +++ b/config/nimrod.cfg @@ -18,14 +18,14 @@ path="$lib/pure" path="$lib/pure/collections" path="$lib/impure" path="$lib/wrappers" -path="$lib/wrappers/cairo" -path="$lib/wrappers/gtk" -path="$lib/wrappers/lua" -path="$lib/wrappers/opengl" +# path="$lib/wrappers/cairo" +# path="$lib/wrappers/gtk" +# path="$lib/wrappers/lua" +# path="$lib/wrappers/opengl" path="$lib/wrappers/pcre" path="$lib/wrappers/readline" path="$lib/wrappers/sdl" -path="$lib/wrappers/x11" +# path="$lib/wrappers/x11" path="$lib/wrappers/zip" path="$lib/wrappers/libffi" path="$lib/windows" |