mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
Post merge fix: Move remote XIBs into English.lproj and make them localized again.
This commit is contained in:
André Berg
@@ -28,20 +28,13 @@
|
||||
47DBDB670E94EE8B00671A1E /* PBPrefsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 47DBDB660E94EE8B00671A1E /* PBPrefsWindowController.m */; };
|
||||
47DBDBB10E94F6CA00671A1E /* Updates.png in Resources */ = {isa = PBXBuildFile; fileRef = 47DBDBB00E94F6CA00671A1E /* Updates.png */; };
|
||||
47DBDBCA0E95016F00671A1E /* PBNSURLPathUserDefaultsTransfomer.m in Sources */ = {isa = PBXBuildFile; fileRef = 47DBDBC90E95016F00671A1E /* PBNSURLPathUserDefaultsTransfomer.m */; };
|
||||
652C162710A94D0800B80380 /* PullPopUpTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 652C162410A94D0800B80380 /* PullPopUpTemplate.png */; };
|
||||
652C162810A94D0800B80380 /* PushPopUpTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 652C162510A94D0800B80380 /* PushPopUpTemplate.png */; };
|
||||
652C162910A94D0800B80380 /* RebasePopUpTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 652C162610A94D0800B80380 /* RebasePopUpTemplate.png */; };
|
||||
653D930A109BEAFE00B26705 /* PBGitXErrors.m in Sources */ = {isa = PBXBuildFile; fileRef = 653D9309109BEAFE00B26705 /* PBGitXErrors.m */; };
|
||||
653D949E109C257500B26705 /* RebaseTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 653D949D109C257500B26705 /* RebaseTemplate.png */; };
|
||||
653D94A1109C27D400B26705 /* PullTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 653D949F109C27D400B26705 /* PullTemplate.png */; };
|
||||
653D94A2109C27D400B26705 /* PushTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 653D94A0109C27D400B26705 /* PushTemplate.png */; };
|
||||
653D94A5109C42A500B26705 /* CloneRepositoryTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 653D94A4109C42A500B26705 /* CloneRepositoryTemplate.png */; };
|
||||
654D16E8108C6CA6008D960C /* PBQLOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = F513085A0E0740F2000C8BCD /* PBQLOutlineView.m */; };
|
||||
6552BA1E109C4BBB003B4892 /* RepositoryWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 911111E10E58BD5A00BF76B4 /* RepositoryWindow.xib */; };
|
||||
6552BA27109C4CA8003B4892 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47DBDB690E94EF6500671A1E /* Preferences.xib */; };
|
||||
6552BA29109C4CBC003B4892 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F5B721C30E05CF7E00AF29DC /* MainMenu.xib */; };
|
||||
65A102F210A7D9FE0033C593 /* AddRemoteBranchTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 65A102F110A7D9FE0033C593 /* AddRemoteBranchTemplate.png */; };
|
||||
65C77FA0108BF560003BD3B5 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65C77F9F108BF560003BD3B5 /* Quartz.framework */; };
|
||||
65F3544011599F3100235D5B /* AddRemoteBranchTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 65A102F110A7D9FE0033C593 /* AddRemoteBranchTemplate.png */; };
|
||||
65F3555B1159A95700235D5B /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65F3555A1159A95700235D5B /* MainMenu.xib */; };
|
||||
65F3555D1159A96600235D5B /* RepositoryWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65F3555C1159A96600235D5B /* RepositoryWindow.xib */; };
|
||||
770B37ED0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 770B37EC0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel */; };
|
||||
77C8280E06725ACE000B614F /* ApplicationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77C8280C06725ACE000B614F /* ApplicationController.m */; };
|
||||
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
|
||||
@@ -56,7 +49,6 @@
|
||||
93CB42C20EAB7B2200530609 /* PBGitDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CB42C10EAB7B2200530609 /* PBGitDefaults.m */; };
|
||||
93F7857F0EA3ABF100C1F443 /* PBCommitMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F7857E0EA3ABF100C1F443 /* PBCommitMessageView.m */; };
|
||||
D26DC6450E782C9000C777B2 /* gitx.icns in Resources */ = {isa = PBXBuildFile; fileRef = D26DC6440E782C9000C777B2 /* gitx.icns */; };
|
||||
D8E41F1410A7B023007BB8FC /* KBPopUpToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = D8E41F1310A7B023007BB8FC /* KBPopUpToolbarItem.m */; };
|
||||
D8083A43111E045D00337480 /* PBRemoteProgressSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D8083A42111E045D00337480 /* PBRemoteProgressSheet.m */; };
|
||||
D8083C44111F106800337480 /* PBAddRemoteSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D8083C43111F106800337480 /* PBAddRemoteSheet.m */; };
|
||||
D8083C47111F136400337480 /* PBAddRemoteSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8083C45111F136400337480 /* PBAddRemoteSheet.xib */; };
|
||||
@@ -235,19 +227,12 @@
|
||||
47DBDB570E94EDE700671A1E /* DBPrefsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBPrefsWindowController.m; sourceTree = "<group>"; };
|
||||
47DBDB650E94EE8B00671A1E /* PBPrefsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBPrefsWindowController.h; sourceTree = "<group>"; };
|
||||
47DBDB660E94EE8B00671A1E /* PBPrefsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBPrefsWindowController.m; sourceTree = "<group>"; };
|
||||
47DBDB690E94EF6500671A1E /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
|
||||
47DBDB690E94EF6500671A1E /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Preferences.xib; path = English.lproj/Preferences.xib; sourceTree = "<group>"; };
|
||||
47DBDBB00E94F6CA00671A1E /* Updates.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Updates.png; path = Images/Preferences/Updates.png; sourceTree = "<group>"; };
|
||||
47DBDBC80E95016F00671A1E /* PBNSURLPathUserDefaultsTransfomer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBNSURLPathUserDefaultsTransfomer.h; sourceTree = "<group>"; };
|
||||
47DBDBC90E95016F00671A1E /* PBNSURLPathUserDefaultsTransfomer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBNSURLPathUserDefaultsTransfomer.m; sourceTree = "<group>"; };
|
||||
652C162410A94D0800B80380 /* PullPopUpTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PullPopUpTemplate.png; path = Images/PullPopUpTemplate.png; sourceTree = "<group>"; };
|
||||
652C162510A94D0800B80380 /* PushPopUpTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PushPopUpTemplate.png; path = Images/PushPopUpTemplate.png; sourceTree = "<group>"; };
|
||||
652C162610A94D0800B80380 /* RebasePopUpTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RebasePopUpTemplate.png; path = Images/RebasePopUpTemplate.png; sourceTree = "<group>"; };
|
||||
653D9308109BEAFE00B26705 /* PBGitXErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitXErrors.h; sourceTree = "<group>"; };
|
||||
653D9309109BEAFE00B26705 /* PBGitXErrors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitXErrors.m; sourceTree = "<group>"; };
|
||||
653D949D109C257500B26705 /* RebaseTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RebaseTemplate.png; path = Images/RebaseTemplate.png; sourceTree = "<group>"; };
|
||||
653D949F109C27D400B26705 /* PullTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PullTemplate.png; path = Images/PullTemplate.png; sourceTree = "<group>"; };
|
||||
653D94A0109C27D400B26705 /* PushTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PushTemplate.png; path = Images/PushTemplate.png; sourceTree = "<group>"; };
|
||||
653D94A4109C42A500B26705 /* CloneRepositoryTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloneRepositoryTemplate.png; path = Images/CloneRepositoryTemplate.png; sourceTree = "<group>"; };
|
||||
654D17E7108C90E8008D960C /* html */ = {isa = PBXFileReference; lastKnownFileType = folder; path = html; sourceTree = "<group>"; };
|
||||
654D18EF108C9597008D960C /* Install.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Install.xcconfig; sourceTree = "<group>"; };
|
||||
654D18F6108C96CB008D960C /* install.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = install.sh; sourceTree = "<group>"; };
|
||||
@@ -259,7 +244,7 @@
|
||||
77C8280C06725ACE000B614F /* ApplicationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplicationController.m; sourceTree = "<group>"; };
|
||||
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
|
||||
8D1107320486CEB800E47090 /* GitX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GitX.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
911111E10E58BD5A00BF76B4 /* RepositoryWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RepositoryWindow.xib; sourceTree = "<group>"; };
|
||||
911111E10E58BD5A00BF76B4 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/RepositoryWindow.xib; sourceTree = "<group>"; };
|
||||
911111F60E594F3F00BF76B4 /* PBRepositoryDocumentController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBRepositoryDocumentController.h; sourceTree = "<group>"; };
|
||||
911111F70E594F3F00BF76B4 /* PBRepositoryDocumentController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBRepositoryDocumentController.m; sourceTree = "<group>"; };
|
||||
911112360E5A097800BF76B4 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
|
||||
@@ -275,8 +260,6 @@
|
||||
93F7857E0EA3ABF100C1F443 /* PBCommitMessageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBCommitMessageView.m; sourceTree = "<group>"; };
|
||||
93FCCBA80EA8AF450061B02B /* PBGitConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitConfig.m; sourceTree = "<group>"; };
|
||||
D26DC6440E782C9000C777B2 /* gitx.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = gitx.icns; sourceTree = "<group>"; };
|
||||
D8E41F1210A7B019007BB8FC /* KBPopUpToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KBPopUpToolbarItem.h; sourceTree = "<group>"; };
|
||||
D8E41F1310A7B023007BB8FC /* KBPopUpToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KBPopUpToolbarItem.m; sourceTree = "<group>"; };
|
||||
D8083A2D111E045300337480 /* PBRemoteProgressSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBRemoteProgressSheet.h; sourceTree = "<group>"; };
|
||||
D8083A42111E045D00337480 /* PBRemoteProgressSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBRemoteProgressSheet.m; sourceTree = "<group>"; };
|
||||
D8083C42111F106800337480 /* PBAddRemoteSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBAddRemoteSheet.h; sourceTree = "<group>"; };
|
||||
@@ -408,7 +391,7 @@
|
||||
F59F1DD4105C4FF300115F88 /* PBGitIndex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitIndex.m; sourceTree = "<group>"; };
|
||||
F5AD56770E79B78100EDAAFE /* PBCommitList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBCommitList.h; sourceTree = "<group>"; };
|
||||
F5AD56780E79B78100EDAAFE /* PBCommitList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBCommitList.m; sourceTree = "<group>"; };
|
||||
F5B721C30E05CF7E00AF29DC /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
|
||||
F5B721C30E05CF7E00AF29DC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
|
||||
F5C007730E731B48007B84B2 /* PBGitRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRef.h; sourceTree = "<group>"; };
|
||||
F5C007740E731B48007B84B2 /* PBGitRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitRef.m; sourceTree = "<group>"; };
|
||||
F5C580E40EDA250900995434 /* libgit2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgit2.a; path = libgit2/libgit2.a; sourceTree = "<group>"; };
|
||||
@@ -499,6 +482,7 @@
|
||||
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F5C580E40EDA250900995434 /* libgit2.a */,
|
||||
65C77F9F108BF560003BD3B5 /* Quartz.framework */,
|
||||
F5E4DBFA0EAB58D90013FAFC /* SystemConfiguration.framework */,
|
||||
F580E6AD0E733276009E2D3F /* Sparkle.framework */,
|
||||
@@ -557,29 +541,8 @@
|
||||
29B97315FDCFA39411CA2CEA /* Other Sources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
D858108011274D28007F254B /* Branch.png */,
|
||||
D858108111274D28007F254B /* RemoteBranch.png */,
|
||||
D858108211274D28007F254B /* Tag.png */,
|
||||
D85810541127476E007F254B /* StageView.png */,
|
||||
D8FDDBF31143F318005647F6 /* AddRemote.png */,
|
||||
D828A5EF1128AE7200F09D11 /* FetchTemplate.png */,
|
||||
D828A5F01128AE7200F09D11 /* PullTemplate.png */,
|
||||
D828A5F11128AE7200F09D11 /* PushTemplate.png */,
|
||||
D828AEEB112F411100F09D11 /* CloneRepositoryTemplate.png */,
|
||||
3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */,
|
||||
D8A4BD041134AD2900E92D51 /* CherryPickTemplate.png */,
|
||||
D8A4BD051134AD2900E92D51 /* MergeTemplate.png */,
|
||||
D8A4BD061134AD2900E92D51 /* RebaseTemplate.png */,
|
||||
3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */,
|
||||
F56ADDD70ED19F9E002AC78F /* AddBranchTemplate.png */,
|
||||
65A102F110A7D9FE0033C593 /* AddRemoteBranchTemplate.png */,
|
||||
F56ADDD80ED19F9E002AC78F /* AddLabelTemplate.png */,
|
||||
056438B60ED0C40B00985397 /* DetailViewTemplate.png */,
|
||||
F57240BA0E9678EA00D8EE66 /* deleted_file.png */,
|
||||
F5E92A1A0E88550E00056E75 /* empty_file.png */,
|
||||
32CA4F630368D1EE00C91783 /* GitX_Prefix.pch */,
|
||||
29B97316FDCFA39411CA2CEA /* main.m */,
|
||||
F5E92A220E88569500056E75 /* new_file.png */,
|
||||
);
|
||||
name = "Other Sources";
|
||||
sourceTree = "<group>";
|
||||
@@ -587,13 +550,14 @@
|
||||
29B97317FDCFA39411CA2CEA /* Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
65F3543F11599F2400235D5B /* Images */,
|
||||
F50A41130EBB872D00208746 /* Widgets */,
|
||||
47DBDB920E94F47200671A1E /* Preference Icons */,
|
||||
D26DC6440E782C9000C777B2 /* gitx.icns */,
|
||||
8D1107310486CEB800E47090 /* Info.plist */,
|
||||
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
|
||||
F5B721C30E05CF7E00AF29DC /* MainMenu.xib */,
|
||||
911111E10E58BD5A00BF76B4 /* RepositoryWindow.xib */,
|
||||
65F3555A1159A95700235D5B /* MainMenu.xib */,
|
||||
65F3555C1159A96600235D5B /* RepositoryWindow.xib */,
|
||||
F5E424100EA3E4D60046E362 /* PBDiffWindow.xib */,
|
||||
F52BCE020E84208300AA3741 /* PBGitHistoryView.xib */,
|
||||
F59116E50E843BB50072CCB1 /* PBGitCommitView.xib */,
|
||||
@@ -613,7 +577,6 @@
|
||||
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F5C580E40EDA250900995434 /* libgit2.a */,
|
||||
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
|
||||
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
|
||||
);
|
||||
@@ -645,6 +608,34 @@
|
||||
path = scripts;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
65F3543F11599F2400235D5B /* Images */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
D858108011274D28007F254B /* Branch.png */,
|
||||
D858108111274D28007F254B /* RemoteBranch.png */,
|
||||
D858108211274D28007F254B /* Tag.png */,
|
||||
D85810541127476E007F254B /* StageView.png */,
|
||||
D8FDDBF31143F318005647F6 /* AddRemote.png */,
|
||||
D828A5EF1128AE7200F09D11 /* FetchTemplate.png */,
|
||||
D828A5F01128AE7200F09D11 /* PullTemplate.png */,
|
||||
D828A5F11128AE7200F09D11 /* PushTemplate.png */,
|
||||
D828AEEB112F411100F09D11 /* CloneRepositoryTemplate.png */,
|
||||
3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */,
|
||||
D8A4BD041134AD2900E92D51 /* CherryPickTemplate.png */,
|
||||
D8A4BD051134AD2900E92D51 /* MergeTemplate.png */,
|
||||
D8A4BD061134AD2900E92D51 /* RebaseTemplate.png */,
|
||||
3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */,
|
||||
F56ADDD70ED19F9E002AC78F /* AddBranchTemplate.png */,
|
||||
65A102F110A7D9FE0033C593 /* AddRemoteBranchTemplate.png */,
|
||||
F56ADDD80ED19F9E002AC78F /* AddLabelTemplate.png */,
|
||||
056438B60ED0C40B00985397 /* DetailViewTemplate.png */,
|
||||
F57240BA0E9678EA00D8EE66 /* deleted_file.png */,
|
||||
F5E92A1A0E88550E00056E75 /* empty_file.png */,
|
||||
F5E92A220E88569500056E75 /* new_file.png */,
|
||||
);
|
||||
name = Images;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
7756732906782D8800D1FEB8 /* Models */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@@ -794,8 +785,6 @@
|
||||
F5FC41F30EBCBD4300191D80 /* PBGitXProtocol.m */,
|
||||
653D9308109BEAFE00B26705 /* PBGitXErrors.h */,
|
||||
653D9309109BEAFE00B26705 /* PBGitXErrors.m */,
|
||||
D8E41F1210A7B019007BB8FC /* KBPopUpToolbarItem.h */,
|
||||
D8E41F1310A7B023007BB8FC /* KBPopUpToolbarItem.m */,
|
||||
D823487410CB382C00944BDE /* Terminal.h */,
|
||||
F567B88B1057FA9F000DB976 /* NSOutlineViewExt.h */,
|
||||
F567B88C1057FA9F000DB976 /* NSOutlineViewExt.m */,
|
||||
@@ -868,9 +857,9 @@
|
||||
F5E927E10E883D2E00056E75 /* History */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F5C6F6750E65FE2B00478D97 /* Graphing */,
|
||||
F5AD56770E79B78100EDAAFE /* PBCommitList.h */,
|
||||
F5AD56780E79B78100EDAAFE /* PBCommitList.m */,
|
||||
F5C6F6750E65FE2B00478D97 /* Graphing */,
|
||||
D85B93F610E51279007F3C28 /* PBGitRefish.h */,
|
||||
F56524EE0E02D45200F03B52 /* PBGitCommit.h */,
|
||||
F56524EF0E02D45200F03B52 /* PBGitCommit.m */,
|
||||
@@ -1050,24 +1039,37 @@
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
D858108311274D28007F254B /* Branch.png in Resources */,
|
||||
D858108411274D28007F254B /* RemoteBranch.png in Resources */,
|
||||
D858108511274D28007F254B /* Tag.png in Resources */,
|
||||
D85810551127476E007F254B /* StageView.png in Resources */,
|
||||
D8FDDBF41143F318005647F6 /* AddRemote.png in Resources */,
|
||||
D828A5F21128AE7200F09D11 /* FetchTemplate.png in Resources */,
|
||||
D828A5F31128AE7200F09D11 /* PullTemplate.png in Resources */,
|
||||
D828A5F41128AE7200F09D11 /* PushTemplate.png in Resources */,
|
||||
D828AEEC112F411100F09D11 /* CloneRepositoryTemplate.png in Resources */,
|
||||
3BC07F4C0ED5A5C5009A7768 /* HistoryViewTemplate.png in Resources */,
|
||||
D8A4BD071134AD2900E92D51 /* CherryPickTemplate.png in Resources */,
|
||||
D8A4BD081134AD2900E92D51 /* MergeTemplate.png in Resources */,
|
||||
D8A4BD091134AD2900E92D51 /* RebaseTemplate.png in Resources */,
|
||||
3BC07F4D0ED5A5C5009A7768 /* CommitViewTemplate.png in Resources */,
|
||||
F56ADDD90ED19F9E002AC78F /* AddBranchTemplate.png in Resources */,
|
||||
65F3544011599F3100235D5B /* AddRemoteBranchTemplate.png in Resources */,
|
||||
F56ADDDA0ED19F9E002AC78F /* AddLabelTemplate.png in Resources */,
|
||||
056438B70ED0C40B00985397 /* DetailViewTemplate.png in Resources */,
|
||||
F57240BB0E9678EA00D8EE66 /* deleted_file.png in Resources */,
|
||||
F5E92A1B0E88550E00056E75 /* empty_file.png in Resources */,
|
||||
F5E92A230E88569500056E75 /* new_file.png in Resources */,
|
||||
913D5E500E55645900CECEA2 /* gitx in Resources */,
|
||||
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
|
||||
6552BA29109C4CBC003B4892 /* MainMenu.xib in Resources */,
|
||||
6552BA1E109C4BBB003B4892 /* RepositoryWindow.xib in Resources */,
|
||||
65F3555B1159A95700235D5B /* MainMenu.xib in Resources */,
|
||||
65F3555D1159A96600235D5B /* RepositoryWindow.xib in Resources */,
|
||||
D26DC6450E782C9000C777B2 /* gitx.icns in Resources */,
|
||||
F52BCE030E84208300AA3741 /* PBGitHistoryView.xib in Resources */,
|
||||
F59116E60E843BB50072CCB1 /* PBGitCommitView.xib in Resources */,
|
||||
F5E92A230E88569500056E75 /* new_file.png in Resources */,
|
||||
F57240BB0E9678EA00D8EE66 /* deleted_file.png in Resources */,
|
||||
F5E424110EA3E4D60046E362 /* PBDiffWindow.xib in Resources */,
|
||||
F50A411F0EBB874C00208746 /* mainSplitterBar.tiff in Resources */,
|
||||
F50A41200EBB874C00208746 /* mainSplitterDimple.tiff in Resources */,
|
||||
056438B70ED0C40B00985397 /* DetailViewTemplate.png in Resources */,
|
||||
F56ADDD90ED19F9E002AC78F /* AddBranchTemplate.png in Resources */,
|
||||
F56ADDDA0ED19F9E002AC78F /* AddLabelTemplate.png in Resources */,
|
||||
3BC07F4C0ED5A5C5009A7768 /* HistoryViewTemplate.png in Resources */,
|
||||
3BC07F4D0ED5A5C5009A7768 /* CommitViewTemplate.png in Resources */,
|
||||
6552BA27109C4CA8003B4892 /* Preferences.xib in Resources */,
|
||||
47DBDBB10E94F6CA00671A1E /* Updates.png in Resources */,
|
||||
F569AE930F2CBD7C00C2FFA7 /* Credits.html in Resources */,
|
||||
@@ -1079,18 +1081,6 @@
|
||||
D8083DCD111F918900337480 /* PBCloneRepsitoryToSheet.xib in Resources */,
|
||||
D8FDD9F711432A12005647F6 /* PBCloneRepositoryPanel.xib in Resources */,
|
||||
F58DB56010566E3900CFDF4A /* PBGitSidebarView.xib in Resources */,
|
||||
D85810551127476E007F254B /* StageView.png in Resources */,
|
||||
D858108311274D28007F254B /* Branch.png in Resources */,
|
||||
D858108411274D28007F254B /* RemoteBranch.png in Resources */,
|
||||
D858108511274D28007F254B /* Tag.png in Resources */,
|
||||
D828A5F21128AE7200F09D11 /* FetchTemplate.png in Resources */,
|
||||
D828A5F31128AE7200F09D11 /* PullTemplate.png in Resources */,
|
||||
D828A5F41128AE7200F09D11 /* PushTemplate.png in Resources */,
|
||||
D8FDDBF41143F318005647F6 /* AddRemote.png in Resources */,
|
||||
D8A4BD071134AD2900E92D51 /* CherryPickTemplate.png in Resources */,
|
||||
D8A4BD081134AD2900E92D51 /* MergeTemplate.png in Resources */,
|
||||
D8A4BD091134AD2900E92D51 /* RebaseTemplate.png in Resources */,
|
||||
D828AEEC112F411100F09D11 /* CloneRepositoryTemplate.png in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -1225,7 +1215,6 @@
|
||||
F59F1DD5105C4FF300115F88 /* PBGitIndex.m in Sources */,
|
||||
654D16E8108C6CA6008D960C /* PBQLOutlineView.m in Sources */,
|
||||
653D930A109BEAFE00B26705 /* PBGitXErrors.m in Sources */,
|
||||
D8E41F1410A7B023007BB8FC /* KBPopUpToolbarItem.m in Sources */,
|
||||
D854948610D5C01B0083B917 /* PBCreateBranchSheet.m in Sources */,
|
||||
D8E3B34D10DCA958001096A3 /* PBCreateTagSheet.m in Sources */,
|
||||
D8083A43111E045D00337480 /* PBRemoteProgressSheet.m in Sources */,
|
||||
@@ -1327,12 +1316,20 @@
|
||||
47DBDB680E94EF6500671A1E /* Preferences.xib */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
47DBDB690E94EF6500671A1E /* English */,
|
||||
47DBDB690E94EF6500671A1E /* Preferences.xib */,
|
||||
);
|
||||
name = Preferences.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
911111E00E58BD5A00BF76B4 /* RepositoryWindow.xib */ = {
|
||||
65F3555A1159A95700235D5B /* MainMenu.xib */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
F5B721C30E05CF7E00AF29DC /* English */,
|
||||
);
|
||||
name = MainMenu.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
65F3555C1159A96600235D5B /* RepositoryWindow.xib */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
911111E10E58BD5A00BF76B4 /* English */,
|
||||
@@ -1388,14 +1385,6 @@
|
||||
name = PBCloneRepositoryPanel.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F5B721C20E05CF7E00AF29DC /* MainMenu.xib */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
F5B721C30E05CF7E00AF29DC /* English */,
|
||||
);
|
||||
name = MainMenu.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXVariantGroup section */
|
||||
|
||||
/* Begin XCBuildConfiguration section */
|
||||
@@ -1414,6 +1403,7 @@
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||
GCC_PREFIX_HEADER = GitX_Prefix.pch;
|
||||
GCC_VERSION = com.apple.compilers.llvmgcc42;
|
||||
HEADER_SEARCH_PATHS = libgit2/src;
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
|
||||
@@ -1441,6 +1431,7 @@
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||
GCC_PREFIX_HEADER = GitX_Prefix.pch;
|
||||
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
|
||||
GCC_VERSION = com.apple.compilers.llvmgcc42;
|
||||
HEADER_SEARCH_PATHS = libgit2/src;
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
|
||||
@@ -1458,7 +1449,6 @@
|
||||
buildSettings = {
|
||||
GCC_ENABLE_OBJC_GC = required;
|
||||
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = DEBUG_BUILD;
|
||||
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
INFOPLIST_PREPROCESS = YES;
|
||||
@@ -1470,10 +1460,6 @@
|
||||
26FC0A8A0875C7B200E6366F /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = (
|
||||
ppc,
|
||||
i386,
|
||||
);
|
||||
GCC_ENABLE_OBJC_GC = required;
|
||||
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||
|
||||
-3920
File diff suppressed because it is too large
Load Diff
-2245
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user