Adlai Holler
|
fdfe18873a
|
Merge branch 'master' into update-objc
Conflicts:
AsyncDisplayKit/ASDisplayNodeExtras.h
AsyncDisplayKit/Details/ASTextNodeRenderer.h
AsyncDisplayKit/Details/ASTextNodeShadower.h
|
2015-12-01 16:45:25 -08:00 |
|
Levi McCallum
|
04ad021daa
|
Rename positioning block to sport as namespace
|
2015-11-30 06:55:32 -08:00 |
|
Levi McCallum
|
cd78bcce99
|
Convert naming of hash helpers to AS namespace
|
2015-11-30 06:53:50 -08:00 |
|
Levi McCallum
|
a0c05ebffc
|
Rename CK classes to AS classes
|
2015-11-30 06:44:53 -08:00 |
|
Levi McCallum
|
74435fb584
|
Convert ASTextNode to support CKTextKitRenderer
|
2015-11-30 06:41:41 -08:00 |
|
Levi McCallum
|
bae3e3b63d
|
Add latest ComponentKit text kit renderer into project
|
2015-11-30 06:41:40 -08:00 |
|