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

Conflicts:
	AsyncDisplayKit/ASCollectionView.h
	AsyncDisplayKit/ASDisplayNode.h
	AsyncDisplayKit/Details/ASDataController.h
	AsyncDisplayKit/Details/UIView+ASConvenience.h
	AsyncDisplayKit/Layout/ASLayoutSpec.h

2015-10-28 21:10:27 -07:00

..

ASAsciiArtBoxCreator.h

fixed the build again (removed all generic collections)

2015-10-19 10:04:49 -07:00

ASAsciiArtBoxCreator.m

fixed the build again (removed all generic collections)

2015-10-19 10:04:49 -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 branch 'master' into update-objc

2015-10-28 21:10:27 -07:00

ASLayoutSpec.mm

fixed the build again (removed all generic collections)

2015-10-19 10:04:49 -07:00

ASOverlayLayoutSpec.h

Merge latest master and update Layout headers

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

ASOverlayLayoutSpec.mm

Put all ascii box methods into a Debugging category.

2015-10-19 08:32:14 -07:00

ASRatioLayoutSpec.h

Merge latest master and update Layout headers

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

ASRatioLayoutSpec.mm

Put all ascii box methods into a Debugging category.

2015-10-19 08:32:14 -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

Fixes to baseline stack alignment

2015-10-06 21:41:39 -07:00

ASStackLayoutSpec.h

Merge latest master and update Layout headers

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

ASStackLayoutSpec.mm

Put all ascii box methods into a Debugging category.

2015-10-19 08:32:14 -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

Put all ascii box methods into a Debugging category.

2015-10-19 08:32:14 -07:00