Merge pull request #366 from yang-le/master

add *.o to .gitignore

.gitignore

@@ -10,4 +10,5 @@ tinyxml2/tinyxml2-cbp/obj/
 *.opensdf
 *.user
 *.depend
-*.layout
+*.layout
+*.o