Merge latest master and update Layout headers

This commit is contained in:
Adlai Holler
2015-09-17 11:39:59 -07:00
parent cde790124d
commit 717df1cfd2
16 changed files with 78 additions and 19 deletions

View File

@@ -10,6 +10,8 @@
#import <AsyncDisplayKit/ASRelativeSize.h>
NS_ASSUME_NONNULL_BEGIN
/**
* Layout options that can be defined for an ASLayoutable being added to a ASStaticLayoutSpec.
*/
@@ -24,3 +26,5 @@
@property (nonatomic, assign) CGPoint layoutPosition;
@end
NS_ASSUME_NONNULL_END