Peter
|
baf94a7575
|
Merge commit '30ad10da3c34439d6c1c8f8e8f88539d875cf6bf'
# Conflicts:
# AsyncDisplayKit.xcodeproj/project.pbxproj
# Source/ASImageNode+AnimatedImage.mm
# Source/ASImageNode.mm
# Source/AsyncDisplayKit.modulemap
# Source/Details/_ASCollectionViewCell.m
# Source/asdkmodule.modulemap
# Source/module.modulemap
|
2017-04-18 19:50:49 +03:00 |
|
Adlai Holler
|
fcbbea51a6
|
Fix the Initialization Hierarchy (#3207)
* Fix the initializers setup
* Update Swift example
* Remove incorrect comment
* Add one to ASTableNode
|
2017-03-28 11:48:20 -07:00 |
|
Adlai Holler
|
0de270fdfb
|
Revert "Improve designated initializer usage (#3132)"
This reverts commit eaa875c7f2.
|
2017-03-03 15:31:28 -08:00 |
|
Michael Schneider
|
eaa875c7f2
|
Improve designated initializer usage (#3132)
* Improve designated initializer usage
* Some more changes
* Add some whitespace
* Fix some warning
|
2017-03-03 14:49:34 -08:00 |
|
Michael Schneider
|
67baa44fb5
|
Fix -Wdocumentation warnings (#3113)
|
2017-03-01 11:25:37 -08:00 |
|
Adlai Holler
|
73ca6ab514
|
Shuffle & Cleanup Stuff (#3080)
|
2017-02-26 18:14:13 -08:00 |
|