Merge with objp branch.

2026-01-23 07:01:39 +00:00 · 2012-01-05 17:20:02 -05:00
parent c4f95a4901 f636333938
commit d62bfac95e
18 changed files with 55 additions and 53 deletions
--- a/.hgignore
+++ b/.hgignore
@@ -6,6 +6,7 @@ run.py
 *.so
 *.mo
 *.pyd
+.tm_*
 *.xcodeproj/xcuserdata
 *.xcodeproj/project.xcworkspace/xcuserdata
 conf.json