Merge branch 'devel' into bigbreak

Conflicts:
	web/news.txt
This commit is contained in:
Araq 2014-10-23 23:13:49 +02:00
commit 201d3c9ed0
7 changed files with 35 additions and 27 deletions

View file

@ -4,6 +4,9 @@ discard """
import mexporta
# bug #1029:
from rawsockets import accept
# B.TMyObject has been imported implicitly here:
var x: TMyObject
echo($x, q(0), q"0")

View file

@ -1,8 +1,9 @@
discard """
file: "tselfimport.nim"
line: 6
line: 7
errormsg: "A module cannot import itself"
"""
import strutils as su # guard against regression
import tselfimport #ERROR
echo("Hello World")