Added gitignore and gitattributes.

fladdict · Dec 2, 2011 · a6148ee · a6148ee
1 parent f5e8c8c
commit a6148ee
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 128 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.pbxproj -crlf -diff -merge
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,18 @@
+#xcode specific
+build/*
+*.pbxuser
+*.mode2v3
+*.mode1v3
+*.perspective
+*.perspectivev3
+*~.nib
+#ignore private workspace stuff added by Xcode4
+xcuserdata
+project.xcworkspace
+
+## generic files to ignore
+*~
+*.lock
+*.DS_Store
+*.swp
+*.out
diff --git a/AAMFeedback.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/AAMFeedback.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...project.xcworkspace/xcuserdata/fukatsutakayuki.xcuserdatad/UserInterfaceState.xcuserstate b/...project.xcworkspace/xcuserdata/fukatsutakayuki.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/AAMFeedback.xcodeproj/xcuserdata/fukatsutakayuki.xcuserdatad/xcschemes/AAMFeedback.xcscheme b/AAMFeedback.xcodeproj/xcuserdata/fukatsutakayuki.xcuserdatad/xcschemes/AAMFeedback.xcscheme
diff --git a/...dback.xcodeproj/xcuserdata/fukatsutakayuki.xcuserdatad/xcschemes/xcschememanagement.plist b/...dback.xcodeproj/xcuserdata/fukatsutakayuki.xcuserdatad/xcschemes/xcschememanagement.plist