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

..

ASBackgroundLayoutSpec.h

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

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

ASBackgroundLayoutSpec.mm

addressed comments and fixed tests

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

ASBaselineLayoutable.h

removed "Stack" from baseline related layout names

2015-08-22 19:03:55 -07:00

ASBaselineLayoutSpec.h

Merge remote-tracking branch 'upstream/master' into baseline

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

ASBaselineLayoutSpec.mm

Merge remote-tracking branch 'upstream/master' into baseline

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

ASCenterLayoutSpec.h

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

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

ASCenterLayoutSpec.mm

addressed comments and fixed tests

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

ASDimension.h

[appledoc] Fix all remaining warnings.

2015-07-12 17:27:44 +07:00

ASDimension.mm

Simplify ASDimension:

2015-06-25 11:36:02 +07:00

ASInsetLayoutSpec.h

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

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

ASInsetLayoutSpec.mm

addressed comments and fixed tests

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

ASLayout.h

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

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

ASLayout.mm

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

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

ASLayoutable.h

flailing

2015-08-22 19:03:54 -07:00

ASLayoutSpec.h

Merge remote-tracking branch 'upstream/master' into baseline

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

ASLayoutSpec.mm

new stack layout spec for text

2015-08-22 19:03:54 -07:00

ASOverlayLayoutSpec.h

addressed comments and fixed tests

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

ASOverlayLayoutSpec.mm

addressed comments and fixed tests

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

ASRatioLayoutSpec.h

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

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

ASRatioLayoutSpec.mm

addressed comments and fixed tests

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

ASRelativeSize.h

Clean up #468:

2015-07-10 19:41:17 +07:00

ASRelativeSize.mm

Clean up #468:

2015-07-10 19:41:17 +07:00

ASStackLayoutable.h

Renamed ASStackText... to ASBaselineStack...

2015-08-22 19:03:54 -07:00

ASStackLayoutDefines.h

moved baseline alignment to a layout spec.

2015-08-22 19:03:54 -07:00

ASStackLayoutSpec.h

Merge remote-tracking branch 'upstream/master' into baseline

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

ASStackLayoutSpec.mm

Merge remote-tracking branch 'upstream/master' into baseline

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

ASStaticLayoutSpec.h

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

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

ASStaticLayoutSpec.mm

Merge pull request #623 from rcancro/layoutSpec

2015-08-23 11:31:07 -07:00