Adlai Holler 69767d558e Merge branch 'master' into update-objc ...

Conflicts:
	AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h

2015-12-22 00:28:21 -05:00

..

ASAsciiArtBoxCreator.h

Annotate ASAsciiArtBoxCreator.h

2015-12-01 21:57:45 -08:00

ASAsciiArtBoxCreator.m

Initial experimental commit with functioning preloading, without the working window.

2015-11-30 19:01:57 -08: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

Do not round when resolving relative dimensions

2015-12-17 15:20:40 -08: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

enforce pixels bounds for ASLayout size/position

2015-12-16 13:14:33 -08: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

Fix crash in ASCII art creator for one-element children arrays

2015-11-08 19:04:16 -08: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

Merge pull request #848 from nguyenhuy/JustifyContentSpaceBetweenAndAround

2015-11-29 21:46:42 -08:00

ASStackLayoutSpec.h

Merge branch 'master' into update-objc

2015-12-01 16:45:25 -08:00

ASStackLayoutSpec.mm

Merge pull request #848 from nguyenhuy/JustifyContentSpaceBetweenAndAround

2015-11-29 21:46:42 -08: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