Adlai Holler 8bb9d173dc Merge branch 'master' into update-objc ...

Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
	AsyncDisplayKit/ASMultiplexImageNode.h
	AsyncDisplayKit/ASViewController.h
	AsyncDisplayKit/Details/ASDataController.h

2015-10-05 13:24:16 -07:00

..

ASBackgroundLayoutSpec.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASBackgroundLayoutSpec.mm

Addressed comments to LayoutOptions PR

2015-09-11 16:07:18 -07:00

ASCenterLayoutSpec.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASCenterLayoutSpec.mm

Addressed comments to LayoutOptions PR

2015-09-11 16:07:18 -07:00

ASDimension.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASDimension.mm

Simplify ASDimension:

2015-06-25 11:36:02 +07:00

ASInsetLayoutSpec.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASInsetLayoutSpec.mm

Addressed comments to LayoutOptions PR

2015-09-11 16:07:18 -07:00

ASLayout.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASLayout.mm

Fix building test / profile under Xcode 7

2015-09-19 20:55:40 +02:00

ASLayoutable.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASLayoutablePrivate.h

added documentation

2015-09-15 11:05:30 -07:00

ASLayoutOptions.h

In ASLayoutOptions, make initWithLayoutable: take a nullable argument

2015-09-17 11:42:38 -07:00

ASLayoutOptions.mm

wasn't copying alignSelf

2015-10-02 20:58:52 -07:00

ASLayoutOptionsPrivate.mm

Addressed comments to LayoutOptions PR

2015-09-11 16:07:18 -07:00

ASLayoutSpec.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASLayoutSpec.mm

Changed copyIntoOptions to copyFromOptions

2015-09-16 14:33:54 -07:00

ASOverlayLayoutSpec.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASOverlayLayoutSpec.mm

Addressed comments to LayoutOptions PR

2015-09-11 16:07:18 -07:00

ASRatioLayoutSpec.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASRatioLayoutSpec.mm

Addressed comments to LayoutOptions PR

2015-09-11 16:07:18 -07:00

ASRelativeSize.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASRelativeSize.mm

Clean up #468:

2015-07-10 19:41:17 +07:00

ASStackLayoutable.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASStackLayoutDefines.h

Removed ASBaselineLayoutSpec and made baseline alignment part of ASStackView

2015-09-10 17:29:39 -07:00

ASStackLayoutSpec.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASStackLayoutSpec.mm

Addressed comments to LayoutOptions PR

2015-09-11 16:07:18 -07:00

ASStaticLayoutable.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASStaticLayoutSpec.h

Merge latest master and update Layout headers

2015-09-17 11:39:59 -07:00

ASStaticLayoutSpec.mm

Static layout bug?

2015-10-02 15:56:31 -07:00