ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-02-10 13:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into CollectionRefactoring

Browse Source
This commit is contained in:
Scott Goodson
2015-12-22 23:38:01 -08:00
parent 9944305cfd c020dcff1c
commit fa4308ba7c
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
AsyncDisplayKit.xcodeproj/project.pbxproj
View File

@@ -1525,6 +1525,10 @@
058D09B9195D04C000B7D73C /* Frameworks */,
058D09BA195D04C000B7D73C /* Resources */,
3B9D88CDF51B429C8409E4B6 /* Copy Pods Resources */,
<<<<<<< HEAD
=======
5ADEA7587189397768F2B36C /* Embed Pods Frameworks */,
>>>>>>> master
);
buildRules = (
);
@@ -1654,6 +1658,21 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
5ADEA7587189397768F2B36C /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */