5 Commits

Author	SHA1	Message	Date
rcancro	9bf62d14ab	Merge remote-tracking branch 'upstream/master' into baseline ... # Conflicts: # AsyncDisplayKit/Layout/ASLayoutSpec.h # AsyncDisplayKit/Layout/ASStackLayoutSpec.mm	2015-08-24 09:54:36 -07:00
ricky cancro	ef89f758bc	flailing	2015-08-22 19:03:54 -07:00
rcancro	c06a6be188	ASLayoutSpec are temporarily mutable and have a more obj-c interface	2015-08-21 16:02:36 -07:00
Huy Nguyen	e1fd58268c	Clean up #468: ... - -layoutSpecThatFits: must return an ASLayoutSpec. - Move ASDisplayNode's -measureWithSizeRange: redeclaration to ASDisplayNode.h. - Rename ASStackLayoutChild.h to ASStackLayoutDefines.h. - Rename ASStaticLayoutSpecDimension.h to ASRelativeSize.h. - Don't import ASLayout.h in other headers to prevent circular inclusions. - Explain use cases of ASLayout's initializers. - Clean up ASInternalHelpers.h.	2015-07-10 19:41:17 +07:00
Huy Nguyen	2149d44990	Fix naming convetion: ... - "Layout node" is changed to "layout spec". - Update tests. - Update Kittens sample.	2015-07-01 18:13:44 +07:00