Peter
|
587d2b2132
|
Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'
# Conflicts:
# AsyncDisplayKit.xcodeproj/project.pbxproj
# Source/ASDisplayNode.mm
# Source/ASMapNode.mm
# Source/Details/ASDataController.mm
# Source/Details/ASPINRemoteImageDownloader.h
# Source/Details/ASPINRemoteImageDownloader.m
|
2017-08-04 13:12:06 +03:00 |
|
Garrett Moon
|
8013e25524
|
Update license v2 (#67)
* Fixed license
* Update all licenses
* Update Dangerfile for new license
* Update already updated licenses
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
|
2017-04-24 16:59:57 -07:00 |
|
Adlai Holler
|
0de270fdfb
|
Revert "Improve designated initializer usage (#3132)"
This reverts commit eaa875c7f2e08afa8b597c653be6b7c45cfff66d.
|
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 |
|
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 |
|
Adlai Holler
|
73ca6ab514
|
Shuffle & Cleanup Stuff (#3080)
|
2017-02-26 18:14:13 -08:00 |
|