ignore xcode project user config

kidproquo · Aug 13, 2014 · 81dde4d · 81dde4d
1 parent 575473c
commit 81dde4d
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 552 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,8 @@ ProgrammerGuideGame/cocos2d
 .DS_Store
 .AppleDouble
 .LSOverride
+ProgrammerGuideGame/proj.ios_mac/ProgrammerGuideGame.xcodeproj/project.xcworkspace
+ProgrammerGuideGame/proj.ios_mac/ProgrammerGuideGame.xcodeproj/xcuserdata
 
 # Icon must end with two \r
 Icon

diff --git a/ProgrammerGuideGame/.DS_Store b/ProgrammerGuideGame/.DS_Store
diff --git a/ProgrammerGuideGame/Classes/AppDelegate.cpp b/ProgrammerGuideGame/Classes/AppDelegate.cpp
@@ -14,7 +14,7 @@ bool AppDelegate::applicationDidFinishLaunching() {
     auto director = Director::getInstance();
     auto glview = director->getOpenGLView();
     if(!glview) {
-        glview = GLView::create("My Game");
+        glview = GLViewImpl::create("My Game");
         director->setOpenGLView(glview);
     }
 

diff --git a/...e/proj.ios_mac/ProgrammerGuideGame.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/...e/proj.ios_mac/ProgrammerGuideGame.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...rammerGuideGame.xcodeproj/project.xcworkspace/xcshareddata/ProgrammerGuideGame.xccheckout b/...rammerGuideGame.xcodeproj/project.xcworkspace/xcshareddata/ProgrammerGuideGame.xccheckout
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/jtsm.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/jtsm.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...me.xcodeproj/project.xcworkspace/xcuserdata/jtsm.xcuserdatad/WorkspaceSettings.xcsettings b/...me.xcodeproj/project.xcworkspace/xcuserdata/jtsm.xcuserdatad/WorkspaceSettings.xcsettings
diff --git a/...ammerGuideGame.xcodeproj/xcuserdata/jtsm.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...ammerGuideGame.xcodeproj/xcuserdata/jtsm.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist