Peter Iakovlev fb270baddd Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54' ...

# Conflicts:
#	Source/ASVideoPlayerNode.h
#	Source/Details/ASElementMap.mm
#	Source/Details/_ASCollectionReusableView.mm
#	Source/Details/_ASCollectionViewCell.mm
#	Source/Private/ASMutableElementMap.mm

2018-11-16 14:41:49 +04:00

..

Transactions

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

_ASCollectionReusableView.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

_ASCollectionReusableView.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

_ASCollectionViewCell.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

_ASCollectionViewCell.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

_ASDisplayLayer.h

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

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

_ASDisplayLayer.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

_ASDisplayView.h

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

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

_ASDisplayView.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

_ASDisplayViewAccessiblity.h

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

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

_ASDisplayViewAccessiblity.mm

A11y for scrollnode (#1188)

2018-10-29 16:07:50 -07:00

ASAbstractLayoutController.h

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

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

ASAbstractLayoutController.mm

Set default tuning params (#1158)

2018-10-10 10:46:33 -07:00

ASBasicImageDownloader.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASBasicImageDownloader.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

ASBatchContext.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASBatchContext.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

ASBatchFetchingDelegate.h

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

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

ASCollectionElement.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionElement.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionFlowLayoutDelegate.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionFlowLayoutDelegate.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

ASCollectionGalleryLayoutDelegate.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionGalleryLayoutDelegate.m

Improvements in ASCollectionGalleryLayoutDelegate (#496)

2017-08-08 19:11:40 +01:00

ASCollectionGalleryLayoutDelegate.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionInternal.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionLayoutContext.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionLayoutContext.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

ASCollectionLayoutDelegate.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionLayoutState.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionLayoutState.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionViewLayoutController.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionViewLayoutController.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

ASCollectionViewLayoutInspector.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASCollectionViewLayoutInspector.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

ASDataController.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASDataController.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASDelegateProxy.h

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

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

ASDelegateProxy.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

ASElementMap.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASElementMap.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

ASEventLog.h

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

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

ASEventLog.mm

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

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

ASGraphicsContext.h

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

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

ASGraphicsContext.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

ASHashing.h

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

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

ASHashing.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

ASHighlightOverlayLayer.h

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

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

ASHighlightOverlayLayer.mm

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

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

ASImageContainerProtocolCategories.h

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

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

ASImageContainerProtocolCategories.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

ASImageProtocols.h

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

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

ASIntegerMap.h

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

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

ASIntegerMap.mm

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

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

ASLayoutController.h

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

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

ASLayoutRangeType.h

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

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

ASMainSerialQueue.h

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

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

ASMainSerialQueue.mm

ASThread: Remove Locker, Unlocker, and SharedMutex (#1213)

2018-11-05 13:26:36 -08:00

ASMutableAttributedStringBuilder.h

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

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

ASMutableAttributedStringBuilder.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

ASObjectDescriptionHelpers.h

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

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

ASObjectDescriptionHelpers.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

ASPageTable.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASPageTable.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

ASPhotosFrameworkImageRequest.h

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

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

ASPhotosFrameworkImageRequest.h.orig

no message

2018-10-10 20:10:04 +03:00

ASPhotosFrameworkImageRequest.m.orig

no message

2018-10-10 20:10:04 +03:00

ASPhotosFrameworkImageRequest.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

ASPINRemoteImageDownloader.h

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

ASPINRemoteImageDownloader.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

ASRangeController.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASRangeController.mm

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASRangeControllerUpdateRangeProtocol+Beta.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASRecursiveUnfairLock.h

Address Xcode warnings about unguarded availability and implicit self retains (#1207)

2018-11-01 19:40:16 -07:00

ASRecursiveUnfairLock.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

ASScrollDirection.h

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

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

ASScrollDirection.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

ASSectionContext.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASTableLayoutController.h

Merge commit '565da7d4935740d12fc204aa061faf093831da1e'

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

ASTableLayoutController.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

ASThread.h

Initialize mutex assertion variables (#1226)

2018-11-08 13:07:46 -08:00

ASTraceEvent.h

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

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

ASTraceEvent.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

ASTraitCollection.h

Rework ASTraitCollection to Fix Warnings and Remove Boilerplate (#1211)

2018-11-06 08:31:09 -08:00

ASTraitCollection.mm

Rework ASTraitCollection to Fix Warnings and Remove Boilerplate (#1211)

2018-11-06 08:31:09 -08:00

ASWeakProxy.h

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

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

ASWeakProxy.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

ASWeakSet.h

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

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

ASWeakSet.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

CoreGraphics+ASConvenience.h

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

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

NSArray+Diffing.h

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

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

NSArray+Diffing.mm

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

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

NSIndexSet+ASHelpers.h

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

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

NSIndexSet+ASHelpers.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

NSMutableAttributedString+TextKitAdditions.h

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

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

NSMutableAttributedString+TextKitAdditions.mm

Convert the codebase to Objective-C++ (#1206)

2018-11-02 12:04:14 -07:00

UICollectionViewLayout+ASConvenience.h

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

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

UICollectionViewLayout+ASConvenience.mm

Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'

2018-11-16 14:41:49 +04:00

UIView+ASConvenience.h

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

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