Merge with default

fchen9 · Dec 30, 2011 · f626e4f · f626e4f
2 parents e86be09 + 3194f75
commit f626e4f
Show file tree

Hide file tree

Showing 193 changed files with 6,933 additions and 4,457 deletions.
diff --git a/.hgignore b/.hgignore
@@ -15,6 +15,7 @@ syntax: regexp
 ^\.lib.*\.arxml
 
 syntax: regexp
-^.project$
+^.project$
+^.settings$
 syntax: glob
 binaries/*