summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-04-02 20:35:41 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-04-02 20:35:41 +0200
commit31010d6d3ba6600860a9f6dd925ac3d8e3f2c830 (patch)
tree88e0c06f16f00e635860f1ecc7d65d8e0cf4d1de /.gitignore
parentbbb4c1c61863b9032af2291bff20814733995391 (diff)
parent9015268746ed9052a9dc83839b2834b5feeab166 (diff)
downloadmana-client-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.tar.gz
mana-client-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.tar.bz2
mana-client-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.tar.xz
mana-client-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.zip
Merge branch '0.6'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 944c483e..36b1dea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,7 @@ docs/SOURCE/html/*
# static libraries
*.a
+
+# Xcode settings
+Xcode/mana.xcodeproj/xcuserdata
+Xcode/mana.xcodeproj/project.xcworkspace/xcuserdata