Skip to content

Commit d50c116

Browse files
committed
Merge branch 'master' into dev-0.6.0
Import fixes in 0.5.2
2 parents b226840 + 19e5264 commit d50c116

6 files changed

Lines changed: 276 additions & 120 deletions

File tree

EasyImagy.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161
D6134AE41F85DA5C005592A2 /* RGBA.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6134A371F852A49005592A2 /* RGBA.swift */; };
6262
D6134AE51F85DA5C005592A2 /* Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6134A381F852A49005592A2 /* Util.swift */; };
6363
D6134B0A1F85DC64005592A2 /* EasyImagy.h in Headers */ = {isa = PBXBuildFile; fileRef = D6134A2A1F852A49005592A2 /* EasyImagy.h */; settings = {ATTRIBUTES = (Public, ); }; };
64+
D62285BA221171A3006A6D9C /* AutoreleaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62285B9221171A3006A6D9C /* AutoreleaseTests.swift */; };
65+
D62285BB221171A3006A6D9C /* AutoreleaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62285B9221171A3006A6D9C /* AutoreleaseTests.swift */; };
66+
D62285BC221171A3006A6D9C /* AutoreleaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62285B9221171A3006A6D9C /* AutoreleaseTests.swift */; };
6467
D62C6EBB1FC9DAD900E7DF02 /* RGBATyped.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60D48A61FA16BB90047F2D3 /* RGBATyped.swift */; };
6568
D62C6EBC1FC9DADA00E7DF02 /* RGBATyped.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60D48A61FA16BB90047F2D3 /* RGBATyped.swift */; };
6669
D62C6EBD1FC9DADB00E7DF02 /* RGBATyped.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60D48A61FA16BB90047F2D3 /* RGBATyped.swift */; };
@@ -218,6 +221,7 @@
218221
D6134AA21F85D1F9005592A2 /* EasyImagy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = EasyImagy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
219222
D6134AAA1F85D1FA005592A2 /* EasyImagyTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EasyImagyTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
220223
D6134AD21F85D800005592A2 /* EasyImagy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = EasyImagy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
224+
D62285B9221171A3006A6D9C /* AutoreleaseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutoreleaseTests.swift; sourceTree = "<group>"; };
221225
D62C6EC11FCBA67500E7DF02 /* UIKitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKitTests.swift; sourceTree = "<group>"; };
222226
D62C6EC61FCC18E600E7DF02 /* HigherOrderFunctions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HigherOrderFunctions.swift; sourceTree = "<group>"; };
223227
D62C6ED01FCD666600E7DF02 /* Util.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Util.swift; sourceTree = "<group>"; };
@@ -383,6 +387,7 @@
383387
D6B4EE201FE2699700B6B7B0 /* AnyImageTests.swift */,
384388
D6134A3C1F852A57005592A2 /* AppKitTests.swift */,
385389
D632C8AA21354DE20030D7D1 /* AppUIKitTests.swift */,
390+
D62285B9221171A3006A6D9C /* AutoreleaseTests.swift */,
386391
D63109161FCFF252009974D0 /* ConvolutionTests.swift */,
387392
D6134A3D1F852A57005592A2 /* CoreGraphicsTest.swift */,
388393
D6134A3B1F852A57005592A2 /* EasyImagyTests.swift */,
@@ -734,6 +739,7 @@
734739
D6B4EE211FE2699700B6B7B0 /* AnyImageTests.swift in Sources */,
735740
D6134A4A1F852A64005592A2 /* CoreGraphicsTest.swift in Sources */,
736741
D63109291FD0056B009974D0 /* RGBAOperatorsTests.swift in Sources */,
742+
D62285BA221171A3006A6D9C /* AutoreleaseTests.swift in Sources */,
737743
D62C6ED11FCD666600E7DF02 /* Util.swift in Sources */,
738744
D6B8BF841FE57E22009C7C30 /* ResizingTests.swift in Sources */,
739745
D6134A4D1F852A64005592A2 /* RGBATests.swift in Sources */,
@@ -791,6 +797,7 @@
791797
D6B4EE221FE2699700B6B7B0 /* AnyImageTests.swift in Sources */,
792798
D6134A881F85CF6F005592A2 /* CoreGraphicsTest.swift in Sources */,
793799
D631092A1FD0056B009974D0 /* RGBAOperatorsTests.swift in Sources */,
800+
D62285BB221171A3006A6D9C /* AutoreleaseTests.swift in Sources */,
794801
D62C6ED21FCD666600E7DF02 /* Util.swift in Sources */,
795802
D6B8BF851FE57E22009C7C30 /* ResizingTests.swift in Sources */,
796803
D6134A8B1F85CF6F005592A2 /* RGBATests.swift in Sources */,
@@ -848,6 +855,7 @@
848855
D6B4EE231FE2699700B6B7B0 /* AnyImageTests.swift in Sources */,
849856
D6134AC71F85D2BF005592A2 /* CoreGraphicsTest.swift in Sources */,
850857
D631092B1FD0056B009974D0 /* RGBAOperatorsTests.swift in Sources */,
858+
D62285BC221171A3006A6D9C /* AutoreleaseTests.swift in Sources */,
851859
D62C6ED31FCD666600E7DF02 /* Util.swift in Sources */,
852860
D6B8BF861FE57E22009C7C30 /* ResizingTests.swift in Sources */,
853861
D6134ACA1F85D2BF005592A2 /* RGBATests.swift in Sources */,

0 commit comments

Comments
 (0)