Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 21 Mar 2008 15:38:02 +0100
changeset 428 432aa523282c
parent 425 ff5b52ea337b (diff)
parent 427 39fef460b62c (current diff)
child 430 15a4c3d86501
Merge with stable
--- a/.hgignore	Fri Mar 21 14:52:24 2008 +0100
+++ b/.hgignore	Fri Mar 21 15:38:02 2008 +0100
@@ -6,6 +6,7 @@
 *.swp
 *.orig
 *.rej
+.DS_Store
 
 build/*
 MANIFEST