Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sun, 23 Mar 2008 13:34:56 +0100
changeset 430 15a4c3d86501
parent 428 432aa523282c (diff)
parent 429 688d71563c07 (current diff)
child 436 ca455dfc5c80
Merge with stable
--- a/.hgignore	Sat Mar 22 18:33:10 2008 +0100
+++ b/.hgignore	Sun Mar 23 13:34:56 2008 +0100
@@ -6,6 +6,7 @@
 *.swp
 *.orig
 *.rej
+.DS_Store
 
 build/*
 MANIFEST