Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 10 Apr 2008 01:48:29 +0200
changeset 446 1c3a9f84dbbc
parent 443 3b71ebfe45ac (diff)
parent 445 0c91995647e9 (current diff)
child 451 78796cd3e7d0
Merge with stable
hgkw/keyword.py
--- a/.hgignore	Thu Apr 10 01:46:06 2008 +0200
+++ b/.hgignore	Thu Apr 10 01:48:29 2008 +0200
@@ -6,6 +6,7 @@
 *.swp
 *.orig
 *.rej
+.DS_Store
 
 build/*
 MANIFEST