ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 14:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ASDisplayNode-init-perf

Browse Source 
Conflicts:
	AsyncDisplayKit/ASDisplayNode.mm
This commit is contained in:
Ethan Nagel
2015-08-17 11:46:29 -07:00
parent 176e4962bf 3983bf2289
commit 5dabd20b54
10 changed files with 41 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AsyncDisplayKit/Private/ASDisplayNodeInternal.h
View File

@@ -28,7 +28,7 @@ typedef NS_OPTIONS(NSUInteger, ASDisplayNodeMethodOverrides) {
ASDisplayNodeMethodOverrideTouchesCancelled = 1 << 1,
ASDisplayNodeMethodOverrideTouchesEnded = 1 << 2,
ASDisplayNodeMethodOverrideTouchesMoved = 1 << 3,
ASDisplayNodeMethodOverrideCalculateSizeThatFits = 1 << 4
ASDisplayNodeMethodOverrideLayoutSpecThatFits = 1 << 4
};
@class _ASPendingState;