summary refs log tree commit diff stats
path: root/compiler/lookups.nim
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2013-12-24 02:10:59 +0100
committerAraq <rumpf_a@web.de>2013-12-24 02:10:59 +0100
commit4203e8955c83985fd633c2a8abd86a1549a6a736 (patch)
tree9e7241bcba08a489046cff7d9fa34a278d837ae3 /compiler/lookups.nim
parent84e471032040b68461c638625dcac274176c594e (diff)
parent064df34ae4134490c5be048becd0fa5294f82194 (diff)
downloadNim-4203e8955c83985fd633c2a8abd86a1549a6a736.tar.gz
Merge branch 'newtempl' into devel
Conflicts:
	lib/system.nim
	tests/reject/tenummix.nim
	todo.txt
Diffstat (limited to 'compiler/lookups.nim')
0 files changed, 0 insertions, 0 deletions