Swiftgram/Private at d1ab6976b5c99f643f17da5d2596fa751174f0d1 - Swiftgram - Tee für ThePain :D

ThePain/Swiftgram

mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 06:10:03 +00:00

History

Peter d1ab6976b5 Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3'

# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
#	AsyncDisplayKit/ASPagerFlowLayout.m
#	AsyncDisplayKit/AsyncDisplayKit.modulemap
#	AsyncDisplayKit/Details/ASCollectionDataController.h
#	AsyncDisplayKit/Details/ASCollectionDataController.mm
#	AsyncDisplayKit/Details/ASDataController.mm
#	AsyncDisplayKit/Private/ASDataController+Subclasses.h
#	AsyncDisplayKit/module.modulemap
#	Source/Debug/AsyncDisplayKit+Debug.h
#	Source/Details/ASCollectionElement.mm
#	Source/module.modulemap

2017-03-01 15:57:40 +04:00

..

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

_ASCoreAnimationExtras.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

_ASCoreAnimationExtras.mm

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

_ASHierarchyChangeSet.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

_ASHierarchyChangeSet.mm

Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3'

2017-03-01 15:57:40 +04:00

_ASPendingState.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

_ASPendingState.mm

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

_ASScopeTimer.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASBasicImageDownloaderInternal.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASBatchFetching.h

Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3'

2017-03-01 15:57:40 +04:00

ASBatchFetching.m

Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3'

2017-03-01 15:57:40 +04:00

ASCellNode+Internal.h

Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3'

2017-03-01 15:57:40 +04:00

ASCollectionView+Undeprecated.h

Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3'

2017-03-01 15:57:40 +04:00

ASCollectionViewFlowLayoutInspector.h

Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3'

2017-03-01 15:57:40 +04:00

ASCollectionViewFlowLayoutInspector.m

Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3'

2017-03-01 15:57:40 +04:00

ASControlTargetAction.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASControlTargetAction.m

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDefaultPlaybackButton.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDefaultPlaybackButton.m

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDefaultPlayButton.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDefaultPlayButton.m

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDispatch.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDisplayNode+AsyncDisplay.mm

Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3'

2017-03-01 15:57:40 +04:00

ASDisplayNode+DebugTiming.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDisplayNode+DebugTiming.mm

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDisplayNode+FrameworkPrivate.h

[ASCellNode] New way to measure ASCellNode's if layout was invalidated (#3099 )

2017-02-27 17:19:01 -08:00

ASDisplayNode+FrameworkSubclasses.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDisplayNode+UIViewBridge.mm

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDisplayNodeInternal.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDisplayNodeLayout.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASDisplayNodeLayout.mm

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASElementMap.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASElementMap.m

Fix crashes in ASElementMap and ASMutableElementMap (#3090 )

2017-02-27 09:07:23 -08:00

ASIGListAdapterBasedDataSource.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASIGListAdapterBasedDataSource.m

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASImageNode+AnimatedImagePrivate.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASImageNode+CGExtras.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASImageNode+CGExtras.m

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASInternalHelpers.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASInternalHelpers.m

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASLayoutTransition.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASLayoutTransition.mm

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASMultidimensionalArrayUtils.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASMultidimensionalArrayUtils.mm

Fix crashes in ASElementMap and ASMutableElementMap (#3090 )

2017-02-27 09:07:23 -08:00

ASMutableElementMap.h

Fix Issues Repopulating Supplementary Elements (#3098 )

2017-02-27 16:06:06 -08:00

ASMutableElementMap.m

Fix Issues Repopulating Supplementary Elements (#3098 )

2017-02-27 16:06:06 -08:00

ASPendingStateController.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASPendingStateController.mm

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASRectTable.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASRectTable.m

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASResponderChainEnumerator.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASResponderChainEnumerator.m

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASSection.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASSection.m

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASTableView+Undeprecated.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASWeakMap.h

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00

ASWeakMap.m

Shuffle & Cleanup Stuff (#3080 )

2017-02-26 18:14:13 -08:00