Merge remote-tracking branch 'origin/master'

This commit is contained in:
Kilian Hofmann 2016-06-02 18:01:24 +02:00
commit 4c4bf04e0d

View File

@ -58,6 +58,7 @@
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
3A4DEEC164570A675464527C /* Pods-FMC Planner 2UITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FMC Planner 2UITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FMC Planner 2UITests/Pods-FMC Planner 2UITests.debug.xcconfig"; sourceTree = "<group>"; }; 3A4DEEC164570A675464527C /* Pods-FMC Planner 2UITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FMC Planner 2UITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FMC Planner 2UITests/Pods-FMC Planner 2UITests.debug.xcconfig"; sourceTree = "<group>"; };
40A5DD1D70332EE79EE91638 /* libPods-FMC Planner 2UITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FMC Planner 2UITests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
49ECBB2A9C708150C7EF0B6D /* Pods-FMC Planner 2.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FMC Planner 2.release.xcconfig"; path = "Pods/Target Support Files/Pods-FMC Planner 2/Pods-FMC Planner 2.release.xcconfig"; sourceTree = "<group>"; }; 49ECBB2A9C708150C7EF0B6D /* Pods-FMC Planner 2.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FMC Planner 2.release.xcconfig"; path = "Pods/Target Support Files/Pods-FMC Planner 2/Pods-FMC Planner 2.release.xcconfig"; sourceTree = "<group>"; };
585EEA4F1A002BACA8C8FAAC /* libPods-FMC Planner 2Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FMC Planner 2Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 585EEA4F1A002BACA8C8FAAC /* libPods-FMC Planner 2Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FMC Planner 2Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
64A5F6E611B5803249E6DC1F /* Pods-FMC Planner 2Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FMC Planner 2Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-FMC Planner 2Tests/Pods-FMC Planner 2Tests.release.xcconfig"; sourceTree = "<group>"; }; 64A5F6E611B5803249E6DC1F /* Pods-FMC Planner 2Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FMC Planner 2Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-FMC Planner 2Tests/Pods-FMC Planner 2Tests.release.xcconfig"; sourceTree = "<group>"; };