Peter a085123ec1 Merge commit '565da7d4935740d12fc204aa061faf093831da1e' ...

# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
#	AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme
#	Source/ASDisplayNode.mm
#	Source/ASEditableTextNode.h
#	Source/ASImageNode.mm
#	Source/ASMapNode.h
#	Source/ASMapNode.mm
#	Source/Base/ASAssert.m
#	Source/Details/ASPhotosFrameworkImageRequest.h
#	Source/Details/ASPhotosFrameworkImageRequest.m
#	Source/Layout/ASLayoutElement.mm

2018-10-08 22:42:45 +03:00

..

ASAbsoluteLayoutElement.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASAbsoluteLayoutSpec.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASAbsoluteLayoutSpec.mm

Make yoga & layout specs faster by eliminating some copies (#1128)

2018-09-18 07:26:29 -07:00

ASAsciiArtBoxCreator.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASAsciiArtBoxCreator.m

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASBackgroundLayoutSpec.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASBackgroundLayoutSpec.mm

Make yoga & layout specs faster by eliminating some copies (#1128)

2018-09-18 07:26:29 -07:00

ASCenterLayoutSpec.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASCenterLayoutSpec.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASCornerLayoutSpec.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASCornerLayoutSpec.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDimension.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDimension.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDimensionInternal.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASDimensionInternal.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASInsetLayoutSpec.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASInsetLayoutSpec.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayout.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayout.mm

Remove ASRectMap, which is not worth its own weight (#1127)

2018-09-18 11:58:24 -07:00

ASLayout+IGListKit.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayout+IGListKit.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutElement.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutElement.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

2018-10-08 22:42:45 +03:00

ASLayoutElementExtensibility.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutElementPrivate.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutSpec.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutSpec.mm

Make yoga & layout specs faster by eliminating some copies (#1128)

2018-09-18 07:26:29 -07:00

ASLayoutSpec+Subclasses.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASLayoutSpec+Subclasses.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASOverlayLayoutSpec.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASOverlayLayoutSpec.mm

Make yoga & layout specs faster by eliminating some copies (#1128)

2018-09-18 07:26:29 -07:00

ASRatioLayoutSpec.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASRatioLayoutSpec.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASRelativeLayoutSpec.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASRelativeLayoutSpec.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASStackLayoutDefines.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASStackLayoutElement.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASStackLayoutSpec.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASStackLayoutSpec.mm

Make yoga & layout specs faster by eliminating some copies (#1128)

2018-09-18 07:26:29 -07:00

ASYogaUtilities.h

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00

ASYogaUtilities.mm

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)

2018-08-28 07:39:18 -07:00