ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-03-19 13:53:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f40f08753d432cdaa7a799a7875bfc2a1f21c973'

Browse Source 
# Conflicts:
#	AsyncDisplayKit/ASDisplayNode.mm
This commit is contained in:
Peter
2016-08-09 00:22:26 +03:00
parent e0dbb64ee5 f40f08753d
commit 88bb8b3f6e
242 changed files with 8601 additions and 5754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

694
AsyncDisplayKit.xcodeproj/project.pbxproj
View File

File diff suppressed because it is too large Load Diff

2
AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit-iOS.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"