Permalink
Browse files

Preserve changes

  • Loading branch information...
1 parent 056953c commit 8b7cd8e98059206a40b11881d8a5baf415ecd286 @glejeune glejeune committed Nov 9, 2010
View
@@ -0,0 +1,2 @@
+*.pbxproj -crlf -diff -merge
+
View
@@ -1,34 +1,12 @@
-# Mac OS X Finder and whatnot
-.DS_Store
-
-# Sparkle distribution Private Key (Don't check me in!)
-dsa_priv.pem
-
-# XCode (and ancestors) per-user config (very noisy, and not relevant)
-*.mode1
+# xcode noise
+build/*
+*.pbxuser
*.mode1v3
-*.mode2v3
-*.perspective
*.perspectivev3
-*.pbxuser
-
-# Generated files
-VersionX-revision.h
-# build products
-build/
-*.[oa]
-
-# Other source repository archive directories (protects when importing)
-.hg
+# old skool
.svn
-CVS
-# automatic backup files
-*~.nib
-*.swp
-*~
-*(Autosaved).rtfd/
-Backup[ ]of[ ]*.pages/
-Backup[ ]of[ ]*.key/
-Backup[ ]of[ ]*.numbers/
+# osx noise
+.DS_Store
+profile
@@ -1,130 +0,0 @@
-10
-
-dir
-784
-svn://localhost/users/jonathan/documents/computing/subversion/mugginsoft/Fragaria/trunk/Fragaria.xcodeproj
-svn://localhost/users/jonathan/documents/computing/subversion/mugginsoft
-
-
-
-2010-05-06T16:08:58.400883Z
-784
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-477a7e5d-e706-4eb1-bbf1-8244ee848949
-
-Jonathan.perspectivev3
-file
-799
-
-
-
-2010-07-24T14:40:38.000000Z
-a911b765f57194f97f7ea9ca3c9f4291
-2010-07-24T14:50:50.554586Z
-799
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-48678
-
-Jonathan.pbxuser
-file
-799
-
-
-
-2010-07-24T14:42:02.000000Z
-6d4a5a62b588a98dbded1fdd06c99a22
-2010-07-24T14:50:50.554586Z
-799
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-33318
-
-project.pbxproj
-file
-799
-
-
-
-2010-07-24T14:42:02.000000Z
-402a18993511f6c878a4137bee8b7ec0
-2010-07-24T14:50:50.554586Z
-799
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-65708
-
Oops, something went wrong.

0 comments on commit 8b7cd8e

Please sign in to comment.