summary refs log tree commit diff stats
path: root/config
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2014-10-20 08:44:00 +0200
committerAraq <rumpf_a@web.de>2014-10-20 08:44:00 +0200
commit53a9d6f5cd199382957188cd8a1a7f0aa5035033 (patch)
tree9873032461904538e21cbff3417882d1b54ef881 /config
parentc7570dcd3e4202bd339a2ebbc09952a546c62269 (diff)
parentb0179f9af5c5ed3cc63c5cd3b9d1055b742a3b79 (diff)
downloadNim-53a9d6f5cd199382957188cd8a1a7f0aa5035033.tar.gz
Merge branch 'devel' into bigbreak
Conflicts:
	compiler/nim.ini
	doc/manual.txt
	doc/tut2.txt
	koch.nim
	lib/system/channels.nim
	readme.txt
	tools/niminst/niminst.nim
	tools/nimweb.nim
	web/download.txt
	web/news.txt
Diffstat (limited to 'config')
-rw-r--r--config/nimdoc.cfg6
-rw-r--r--config/nimrod.cfg5
2 files changed, 5 insertions, 6 deletions
diff --git a/config/nimdoc.cfg b/config/nimdoc.cfg
index dc241db50..975c7c06a 100644
--- a/config/nimdoc.cfg
+++ b/config/nimdoc.cfg
@@ -41,7 +41,6 @@ doc.item = """
 <dt id="$itemSym"><a name="$itemSymOrID"></a><pre>$header</pre></dt>
 <dd>
 $desc
-$seeSrc
 </dd>
 """
 
@@ -93,6 +92,11 @@ doc.file = """<?xml version="1.0" encoding="utf-8" ?>
 <title>$title</title>
 <style type="text/css">
 
+body {
+  color: black;
+  background: white;
+}
+
 span.DecNumber {color: blue}
 span.BinNumber {color: blue}
 span.HexNumber {color: blue}
diff --git a/config/nimrod.cfg b/config/nimrod.cfg
index 6d56bba2c..b7210b329 100644
--- a/config/nimrod.cfg
+++ b/config/nimrod.cfg
@@ -132,10 +132,5 @@ vcc.options.always = "/nologo"
 vcc.options.speed = "/Ox /arch:SSE2"
 vcc.options.size = "/O1"
 
-# Configuration for the Digital Mars C/C++ compiler:
-@if windows:
-  dmc.path = r"$nimrod\dist\dm\bin"
-@end
-
 # Configuration for the Tiny C Compiler:
 tcc.options.always = "-w"