rcancro 9bf62d14ab Merge remote-tracking branch 'upstream/master' into baseline ...

# Conflicts:
#	AsyncDisplayKit/Layout/ASLayoutSpec.h
#	AsyncDisplayKit/Layout/ASStackLayoutSpec.mm

2015-08-24 09:54:36 -07:00

..

Sample

addressed comments and fixed tests

2015-08-21 21:03:40 -07:00

Sample.xcodeproj

ASLayoutSpec are temporarily mutable and have a more obj-c interface

2015-08-21 16:02:36 -07:00

Sample.xcworkspace

Example projects.

2014-10-01 16:27:00 -07:00

Default-568h@2x.png

Added defaults for iPhone 6 and 6+ to avoid scaled mode

2014-10-14 20:55:18 -07:00

Default-667h@2x.png

Added defaults for iPhone 6 and 6+ to avoid scaled mode

2014-10-14 20:55:18 -07:00

Default-736h@3x.png

Added defaults for iPhone 6 and 6+ to avoid scaled mode

2014-10-14 20:55:18 -07:00

Podfile

Added source to Podfiles

2014-10-14 18:41:19 -07:00