giuseppenuc/TabBarPicker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	Example/TabBarPicker/TabBarPickerViewController.m
	Pod/Classes/TabBarItem.m
	Pod/Classes/TabBarPicker.m
	Pod/Classes/TabBarPickerSubItemsView.h
	Pod/Classes/TabBarPickerSubItemsView.m
	Pod/Classes/TabBarSubItem.h
	Pod/Classes/TabBarSubItem.m
This commit is contained in:
Giuseppe Nucifora 2015-10-29 01:21:29 +01:00
commit 1d48a97fdc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Example/Podfile
View File

@ -4,6 +4,7 @@ use_frameworks!
inhibit_all_warnings!
pod 'PureLayout'
pod 'pop', '~> 1.0'
pod 'UIView-Overlay'
pod 'UIActionSheet-Blocks'
pod 'UIAlertViewBlockExtension'

2
Pod/Classes/Vendor/MMCPSScrollView/MMCPSScrollView.h vendored
View File

@ -45,7 +45,7 @@ typedef enum {
// Time it takes to scroll to next page
@property (nonatomic) CGFloat scrollingTime;
@property (nonatomic) NSUInteger currentPage;
@property (nonatomic) NSInteger currentPage;
@property (nonatomic, assign) id<MMCPSScrollViewDelegate> MMCPSDelegate;