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

..

Layout

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

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

TextExperiment

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

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

_ASCollectionGalleryLayoutInfo.h

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

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

_ASCollectionGalleryLayoutInfo.m

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

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

_ASCollectionGalleryLayoutItem.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

_ASCollectionGalleryLayoutItem.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

_ASCoreAnimationExtras.h

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

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

_ASCoreAnimationExtras.mm

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

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

_ASHierarchyChangeSet.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

_ASHierarchyChangeSet.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

_ASPendingState.h

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

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

_ASPendingState.mm

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

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

_ASScopeTimer.h

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

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

ASBasicImageDownloaderInternal.h

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

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

ASBatchFetching.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASBatchFetching.m

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCellNode+Internal.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionLayout.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionLayout.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionLayoutCache.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionLayoutCache.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionLayoutContext+Private.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionLayoutDefines.h

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

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

ASCollectionLayoutDefines.m

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

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

ASCollectionLayoutState+Private.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionView+Undeprecated.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionViewFlowLayoutInspector.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionViewFlowLayoutInspector.m

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASControlNode+Private.h

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

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

ASControlTargetAction.h

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

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

ASControlTargetAction.m

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

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

ASDefaultPlaybackButton.h

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

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

ASDefaultPlaybackButton.m

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

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

ASDefaultPlayButton.h

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

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

ASDefaultPlayButton.m

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

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

ASDispatch.h

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

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

ASDispatch.m

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

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

ASDisplayNode+AsyncDisplay.mm

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

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

ASDisplayNode+DebugTiming.h

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

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

ASDisplayNode+DebugTiming.mm

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

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

ASDisplayNode+FrameworkPrivate.h

Fix typos and minor code cleanups #trivial (#1120)

2018-09-17 13:35:00 -07:00

ASDisplayNode+UIViewBridge.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASDisplayNodeCornerLayerDelegate.h

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

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

ASDisplayNodeCornerLayerDelegate.m

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

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

ASDisplayNodeInternal.h

Fix compilation warnings #trivial (#1132)

2018-09-20 07:54:10 -07:00

ASDisplayNodeLayout.h

Remove reliance on shared_ptr for ASDisplayNodeLayouts (#1131)

2018-09-19 11:23:19 -07:00

ASDisplayNodeTipState.h

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

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

ASDisplayNodeTipState.m

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

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

ASIGListAdapterBasedDataSource.h

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

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

ASIGListAdapterBasedDataSource.m

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

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

ASImageNode+AnimatedImagePrivate.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASImageNode+CGExtras.h

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

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

ASImageNode+CGExtras.m

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

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

ASImageNode+Private.h

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

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

ASInternalHelpers.h

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

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

ASInternalHelpers.m

Add a -textureDidInitialize delegate callback (#1100)

2018-09-06 11:08:45 -07:00

ASLayerBackingTipProvider.h

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

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

ASLayerBackingTipProvider.m

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

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

ASLayoutTransition.h

Remove reliance on shared_ptr for ASDisplayNodeLayouts (#1131)

2018-09-19 11:23:19 -07:00

ASLayoutTransition.mm

Remove reliance on shared_ptr for ASDisplayNodeLayouts (#1131)

2018-09-19 11:23:19 -07:00

ASMutableElementMap.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASMutableElementMap.m

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASNetworkImageLoadInfo+Private.h

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

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

ASPendingStateController.h

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

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

ASPendingStateController.mm

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

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

ASResponderChainEnumerator.h

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

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

ASResponderChainEnumerator.m

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

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

ASSection.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASSection.m

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASTableView+Undeprecated.h

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

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

ASTip.h

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

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

ASTip.m

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

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

ASTipNode.h

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

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

ASTipNode.m

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

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

ASTipProvider.h

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

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

ASTipProvider.m

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

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

ASTipsController.h

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

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

ASTipsController.m

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

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

ASTipsWindow.h

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

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

ASTipsWindow.m

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

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

ASTwoDimensionalArrayUtils.h

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

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

ASTwoDimensionalArrayUtils.m

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

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

ASWeakMap.h

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

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

ASWeakMap.m

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

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