Skip to content

Commit

Permalink
Merge branch 'fix-ios6-ptr'
Browse files Browse the repository at this point in the history
  • Loading branch information
shekibobo committed Jan 10, 2013
2 parents 3699364 + a20fc13 commit 9800a85
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 1,292 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,10 @@ build/*
xcuserdata
profile
*.moved-aside

DerivedData/


# CocoaPods
Pods/

6 changes: 3 additions & 3 deletions JMStatefulTableViewController.podspec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Pod::Spec.new do |s|
s.name = 'JMStatefulTableViewController'
s.version = '0.1.0'
s.version = '0.1.1'

s.summary = 'A subclassable table view controller with empty, loading and error states, also supports infinte-scrolling and pull to refresh.'
s.description = 'A subclass-able way to cleanly and neatly implement a table view controller that has empty, loading and error states. Supports "paging" and pull to to refresh thanks to SVPullToRefresh.'

s.homepage = 'https://github.com/jakemarsh/JMStatefulTableViewController'
s.authors = { 'Jake Marsh' => 'jake@deallocatedobjects.com' }
s.source = { :git => 'https://github.com/jakemarsh/JMStatefulTableViewController.git', :tag => '0.1.0' }
s.source = { :git => 'https://github.com/jakemarsh/JMStatefulTableViewController.git', :tag => '0.1.1' }

s.platform = :ios
s.requires_arc = true
Expand All @@ -19,5 +19,5 @@ Pod::Spec.new do |s|

s.source_files = ['JMStatefulTableViewController/*.*']

s.dependency 'SVPullToRefresh', '0.2'
s.dependency 'SVPullToRefresh', :git => 'git://github.com/samvermette/SVPullToRefresh.git', :commit => '1362d86a52a53baa96cbd4e15ad46d50418fe4fa'
end
3 changes: 2 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
platform :ios

pod 'SVPullToRefresh', '0.2'
pod 'SVPullToRefresh', :git => 'git://github.com/samvermette/SVPullToRefresh.git', :commit => '1362d86a52a53baa96cbd4e15ad46d50418fe4fa'

10 changes: 8 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@ PODS:
- SVPullToRefresh (0.2)

DEPENDENCIES:
- SVPullToRefresh (= 0.2)
- SVPullToRefresh (from `git://github.com/samvermette/SVPullToRefresh.git', commit
`1362d86a52a53baa96cbd4e15ad46d50418fe4fa')

EXTERNAL SOURCES:
SVPullToRefresh:
:git: git://github.com/samvermette/SVPullToRefresh.git
:commit: 1362d86a52a53baa96cbd4e15ad46d50418fe4fa

SPEC CHECKSUMS:
SVPullToRefresh: cafc40e50668d7ce0119b7d99270a4cc0cfe5cce
SVPullToRefresh: d95803a9816d3919378ede69342c54927fb953ea

COCOAPODS: 0.16.0
1 change: 0 additions & 1 deletion Pods/Headers/SVPullToRefresh/SVPullToRefresh.h

This file was deleted.

13 changes: 0 additions & 13 deletions Pods/Pods-Acknowledgements.markdown

This file was deleted.

43 changes: 0 additions & 43 deletions Pods/Pods-Acknowledgements.plist

This file was deleted.

3 changes: 0 additions & 3 deletions Pods/Pods-prefix.pch

This file was deleted.

23 changes: 0 additions & 23 deletions Pods/Pods-resources.sh

This file was deleted.

7 changes: 0 additions & 7 deletions Pods/Pods.xcconfig

This file was deleted.

Loading

0 comments on commit 9800a85

Please sign in to comment.