Skip to content

Commit 876c099

Browse files
committed
Merge pull request #386 from libgit2/xcode6
Xcode 6.1 support
2 parents 4f47bdc + 630737f commit 876c099

File tree

159 files changed

+2153
-1845
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+2153
-1845
lines changed

.gitmodules

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
[submodule "libgit2"]
22
path = External/libgit2
33
url = https://github.com/libgit2/libgit2.git
4-
[submodule "ObjectiveGitTests/specta"]
5-
path = ObjectiveGitTests/specta
6-
url = https://github.com/specta/specta.git
7-
[submodule "ObjectiveGitTests/expecta"]
8-
path = ObjectiveGitTests/expecta
9-
url = https://github.com/specta/expecta.git
104
[submodule "Configuration"]
115
path = External/Configuration
126
url = https://github.com/jspahrsummers/xcconfigs.git
@@ -16,3 +10,6 @@
1610
[submodule "libssh2"]
1711
path = External/libssh2
1812
url = git://git.libssh2.org/libssh2.git
13+
[submodule "External/Quick"]
14+
path = External/Quick
15+
url = https://github.com/github/Quick.git

External/Configuration

External/Quick

Submodule Quick added at 30395c6

External/openssl

Submodule openssl updated 378 files

Info.plist

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,23 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>English</string>
6+
<string>en</string>
77
<key>CFBundleExecutable</key>
8-
<string>${EXECUTABLE_NAME}</string>
9-
<key>CFBundleIconFile</key>
10-
<string></string>
8+
<string>$(EXECUTABLE_NAME)</string>
119
<key>CFBundleIdentifier</key>
12-
<string>com.github.${PRODUCT_NAME:rfc1034Identifier}</string>
10+
<string>org.libgit2.$(PRODUCT_NAME:rfc1034identifier)</string>
1311
<key>CFBundleInfoDictionaryVersion</key>
1412
<string>6.0</string>
1513
<key>CFBundleName</key>
16-
<string>${PRODUCT_NAME}</string>
14+
<string>$(PRODUCT_NAME)</string>
1715
<key>CFBundlePackageType</key>
1816
<string>FMWK</string>
1917
<key>CFBundleShortVersionString</key>
20-
<string>0.1</string>
18+
<string>1.0</string>
2119
<key>CFBundleSignature</key>
2220
<string>????</string>
2321
<key>CFBundleVersion</key>
24-
<string>1</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2523
<key>NSPrincipalClass</key>
2624
<string></string>
2725
</dict>

Classes/Categories/NSData+Git.h renamed to ObjectiveGit/Categories/NSData+Git.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// NSData+Git.h
33
//
44

5+
#import <Foundation/Foundation.h>
56
#import "git2.h"
67

78
@interface NSData (Git)
File renamed without changes.

0 commit comments

Comments
 (0)