hg merge

2011-02-23 21:45:26 +07:00
parent a1f425291d d78b379464
commit 253049f0a4
381 changed files with 5486 additions and 1672 deletions
@@ -12,6 +12,7 @@ tests/*.err
 *.idb
 *.pdb
 *.exp
+___*
 .hg
 .hgignore
 .hgtags
@@ -24,6 +25,7 @@ Thumbs.db
 *.mode1v3
 *.exe
 *.vdi
+Docs/doxygen
 PBProject/build
 Xcode/build
 src/build-*