Skip to content

Commit 69fcded

Browse files
author
Thomas Taschauer
committed
Merge branch 'development' of github.com:TomTasche/OpenDocument.ios into feature/localization
2 parents d060779 + 5c4bb81 commit 69fcded

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎OpenDocument.core‎

‎OpenDocumentReader.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -163,77 +163,77 @@
163163
isa = PBXContainerItemProxy;
164164
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
165165
proxyType = 1;
166-
remoteGlobalIDString = 59DBB53456484CB0983C9A43;
166+
remoteGlobalIDString = A62509A9557F4E92908A067C;
167167
remoteInfo = "cryptopp-object";
168168
};
169169
E21C59B124308C720076C37C /* PBXContainerItemProxy */ = {
170170
isa = PBXContainerItemProxy;
171171
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
172172
proxyType = 1;
173-
remoteGlobalIDString = CC12E08925BE42A0AA294E15;
173+
remoteGlobalIDString = CEDAD0E387D14D49B22887C9;
174174
remoteInfo = glog;
175175
};
176176
E21C59B324308C720076C37C /* PBXContainerItemProxy */ = {
177177
isa = PBXContainerItemProxy;
178178
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
179179
proxyType = 1;
180-
remoteGlobalIDString = 8EACE2CBC6E34210A50D99F0;
180+
remoteGlobalIDString = 9BE247E39ACC4A35B0310BDF;
181181
remoteInfo = miniz;
182182
};
183183
E21C59B524308C720076C37C /* PBXContainerItemProxy */ = {
184184
isa = PBXContainerItemProxy;
185185
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
186186
proxyType = 1;
187-
remoteGlobalIDString = EA8D6D3A69944DD3B6ED464B;
187+
remoteGlobalIDString = B3312A6E2A5642299390910E;
188188
remoteInfo = odr;
189189
};
190190
E21C59B724308C720076C37C /* PBXContainerItemProxy */ = {
191191
isa = PBXContainerItemProxy;
192192
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
193193
proxyType = 1;
194-
remoteGlobalIDString = E4812450E4264EA3BD05F075;
194+
remoteGlobalIDString = 7B66EE5A409C4E8CBF03C55B;
195195
remoteInfo = odr_access;
196196
};
197197
E21C59B924308C720076C37C /* PBXContainerItemProxy */ = {
198198
isa = PBXContainerItemProxy;
199199
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
200200
proxyType = 1;
201-
remoteGlobalIDString = 55C82E1E9A1C4FB3ADDB6D3C;
201+
remoteGlobalIDString = 7FCA09740AE0412C973751F4;
202202
remoteInfo = odr_common;
203203
};
204204
E21C59BB24308C720076C37C /* PBXContainerItemProxy */ = {
205205
isa = PBXContainerItemProxy;
206206
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
207207
proxyType = 1;
208-
remoteGlobalIDString = 8955837D11E449258913A737;
208+
remoteGlobalIDString = 714662803DFB448890C736E9;
209209
remoteInfo = odr_crypto;
210210
};
211211
E21C59BD24308C720076C37C /* PBXContainerItemProxy */ = {
212212
isa = PBXContainerItemProxy;
213213
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
214214
proxyType = 1;
215-
remoteGlobalIDString = EF0C4D7C888C4C7DB71A8BBC;
215+
remoteGlobalIDString = A5B45BFEEFFA47C8A8570F1C;
216216
remoteInfo = odr_odf;
217217
};
218218
E21C59BF24308C720076C37C /* PBXContainerItemProxy */ = {
219219
isa = PBXContainerItemProxy;
220220
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
221221
proxyType = 1;
222-
remoteGlobalIDString = 7217A617658D40FDA1DDF157;
222+
remoteGlobalIDString = 75EB44DB7B02498A841AADF1;
223223
remoteInfo = odr_ooxml;
224224
};
225225
E21C59C124308C720076C37C /* PBXContainerItemProxy */ = {
226226
isa = PBXContainerItemProxy;
227227
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
228228
proxyType = 1;
229-
remoteGlobalIDString = 888A4486ED384BE1B26365E4;
229+
remoteGlobalIDString = 07C09E9DBF0C46D7AE25AB14;
230230
remoteInfo = odr_svm;
231231
};
232232
E21C59C324308C720076C37C /* PBXContainerItemProxy */ = {
233233
isa = PBXContainerItemProxy;
234234
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
235235
proxyType = 1;
236-
remoteGlobalIDString = 5A020867743D4E9AB2DF2737;
236+
remoteGlobalIDString = B951B32DE6CB476FBF4105AF;
237237
remoteInfo = tinyxml2;
238238
};
239239
/* End PBXContainerItemProxy section */
@@ -928,7 +928,7 @@
928928
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
929929
CLANG_ENABLE_MODULES = YES;
930930
CODE_SIGN_STYLE = Automatic;
931-
CURRENT_PROJECT_VERSION = 17;
931+
CURRENT_PROJECT_VERSION = 18;
932932
DEVELOPMENT_TEAM = 5LS6X97G6J;
933933
HEADER_SEARCH_PATHS = (
934934
"$(inherited)",
@@ -941,7 +941,7 @@
941941
"@executable_path/Frameworks",
942942
);
943943
LIBRARY_SEARCH_PATHS = "$(inherited)";
944-
MARKETING_VERSION = 1.13;
944+
MARKETING_VERSION = 1.14;
945945
PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader;
946946
PRODUCT_NAME = "$(TARGET_NAME)";
947947
SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;
@@ -958,7 +958,7 @@
958958
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
959959
CLANG_ENABLE_MODULES = YES;
960960
CODE_SIGN_STYLE = Automatic;
961-
CURRENT_PROJECT_VERSION = 17;
961+
CURRENT_PROJECT_VERSION = 18;
962962
DEVELOPMENT_TEAM = 5LS6X97G6J;
963963
HEADER_SEARCH_PATHS = (
964964
"$(inherited)",
@@ -971,7 +971,7 @@
971971
"@executable_path/Frameworks",
972972
);
973973
LIBRARY_SEARCH_PATHS = "$(inherited)";
974-
MARKETING_VERSION = 1.13;
974+
MARKETING_VERSION = 1.14;
975975
PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader;
976976
PRODUCT_NAME = "$(TARGET_NAME)";
977977
SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;

0 commit comments

Comments
 (0)