mirrors
/
SnapKit
mirror of https://github.com/SnapKit/SnapKit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Robert Payne 2015-01-27 00:52:03 +13:00
parent c75495cf4c 821174a978
commit 9fe13a042b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Snap.podspec
View File

@ -1,12 +1,12 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Snap' s.name = 'Snap'
s.version = '0.0.3' s.version = '0.0.4'
s.license = 'MIT' s.license = 'MIT'
s.summary = 'Harness the power of auto layout with a simplified, chainable, and compile time safe syntax.' s.summary = 'Harness the power of auto layout with a simplified, chainable, and compile time safe syntax.'
s.homepage = 'https://github.com/Masonry/Snap' s.homepage = 'https://github.com/Masonry/Snap'
s.authors = { 'Robert Payne' => 'robertpayne@me.com' } s.authors = { 'Robert Payne' => 'robertpayne@me.com' }
s.social_media_url = 'http://twitter.com/robertjpayne' s.social_media_url = 'http://twitter.com/robertjpayne'
s.source = { :git => 'https://github.com/Masonry/Snap.git', :tag => '0.0.3' } s.source = { :git => 'https://github.com/Masonry/Snap.git', :tag => '0.0.4' }
s.ios.deployment_target = '8.0' s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'

3
Snap/Constraint.swift
View File

@ -388,8 +388,7 @@ public class Constraint {
// add constraints // add constraints
installOnView!.addConstraints(layoutConstraints) installOnView!.addConstraints(layoutConstraints)
installOnView!.snp_installedLayoutConstraints = layoutConstraints
self.installedOnView = installOnView self.installedOnView = installOnView
return layoutConstraints return layoutConstraints
} }