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

Fix merge conflicts

Browse Source
This commit is contained in:
Aaron Schubert
2016-04-19 09:02:07 +01:00
parent 3b6ed98e5f 33e36de5dc
commit 21abe8f899
401 changed files with 18358 additions and 4200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AsyncDisplayKit/ASControlNode.h
View File

@@ -41,7 +41,7 @@ typedef NS_OPTIONS(NSUInteger, ASControlState) {
ASControlStateNormal = 0,
ASControlStateHighlighted = 1 << 0, // used when ASControlNode isHighlighted is set
ASControlStateDisabled = 1 << 1,
ASControlStateSelected = 1 << 2, // used when ASControlNode isSeleted is set
ASControlStateSelected = 1 << 2, // used when ASControlNode isSelected is set
ASControlStateReserved = 0xFF000000 // flags reserved for internal framework use
};