Merge branch 'master' into layout_node

This commit is contained in:
Huy Nguyen
2015-06-28 23:47:09 +07:00
14 changed files with 385 additions and 305 deletions

View File

@@ -26,7 +26,10 @@ Pod::Spec.new do |spec|
# ASDealloc2MainObject must be compiled with MRR
spec.requires_arc = true
spec.exclude_files = ['AsyncDisplayKit/Details/ASDealloc2MainObject.m']
spec.exclude_files = [
'AsyncDisplayKit/Details/ASDealloc2MainObject.h',
'AsyncDisplayKit/Details/ASDealloc2MainObject.m',
]
spec.subspec 'ASDealloc2MainObject' do |mrr|
mrr.requires_arc = false
mrr.source_files = [