summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorStelios Tsampas <loathingkernel@gmail.com>2017-07-31 23:14:31 +0300
committerStelios Tsampas <loathingkernel@gmail.com>2017-07-31 23:14:31 +0300
commit7b0c850dcd29cd880dc71490fe9b0b5490c0c036 (patch)
tree0238bf289177ddf0b4afedf862ecafe537f28a11 /.gitignore
parenta93c5c542042b582f2da765aa386772dc8437f01 (diff)
parented3dc690e04382dce36305091ad2e14038147ab4 (diff)
downloadpcsxr-7b0c850dcd29cd880dc71490fe9b0b5490c0c036.tar.gz
Merge branch 'fix-linux-build' into sync-with-codeplex
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 93da4221..f8b3baf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,6 @@ xcuserdata
macosx/Info.plistvers.plist
*.kdev4
linux_build.sh
+project.xcworkspace
.DS_Store
-*.o
build/