Merge branch 'master' into update-objc

Conflicts:
	AsyncDisplayKit/ASCellNode.h
This commit is contained in:
Adlai Holler
2015-11-02 09:36:46 -08:00
39 changed files with 592 additions and 206 deletions

View File

@@ -225,16 +225,6 @@ NS_ASSUME_NONNULL_BEGIN
*/
- (void)reloadItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
/**
* Relayouts the specified item.
*
* @param indexPath The index path identifying the item to relayout.
*
* @discussion This method must be called from the main thread. The relayout is excuted on main thread.
* The node of the specified item must be updated to cause layout changes before this method is called.
*/
- (void)relayoutItemAtIndexPath:(NSIndexPath *)indexPath;
/**
* Moves the item at a specified location to a destination location.
*