# HG changeset patch
# User Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
# Date 1217620573 -7200
# Node ID 4d9108f1fbf418eecccab54d683fdad386a5846e
# Parent  22a56b65872b6e2beb9ff71ae6639027ed9880e1# Parent  7f037b2ab84e8ac354d882c42257f5f73871c520
merge ...

diff -r 22a56b65872b -r 4d9108f1fbf4 .hgignore
--- a/.hgignore	Fri Aug 01 21:55:57 2008 +0200
+++ b/.hgignore	Fri Aug 01 21:56:13 2008 +0200
@@ -6,7 +6,8 @@
 *.s
 *.a
 obj/*
-tango/lib/common/tango/core/*.di
+tango
+import
 Makefile
 bin/llvmdc
 idgen