Skip to content

Add latest changes from base repo #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hons82 merged 4 commits into from
Dec 9, 2014
Merged

Add latest changes from base repo #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1e97b0
.
michalkonturek Sep 29, 2014
35c532f
Podfile: implicit source.
michalkonturek Sep 29, 2014
b35b5d8
.
michalkonturek Sep 29, 2014
7281f3a
Merge branch 'develop'
michalkonturek Sep 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,143 changes: 1,535 additions & 608 deletions GraphKit/GraphKit.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions GraphKit/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
source 'https://github.com/CocoaPods/Specs.git'

pod 'BButton'
pod 'FrameAccessor', '~> 1.3.2'
Expand Down
12 changes: 6 additions & 6 deletions GraphKit/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- BButton (3.2.3)
- BButton (4.0.1)
- FrameAccessor (1.3.2)
- MKFoundationKit/NSArray (1.2.2)
- MKFoundationKit/NSArray (1.2.3)

DEPENDENCIES:
- BButton
- FrameAccessor (~> 1.3.2)
- MKFoundationKit/NSArray (~> 1.2.2)

SPEC CHECKSUMS:
BButton: b405745cd7ccc9444c696b8690fb79541623766a
FrameAccessor: 1c383c4dc298925749fb2a6b9c05cd45be0d8857
MKFoundationKit: 7f203cb163a892826fa567842c441b1a13b4e70b
BButton: 396a5e59648e3f687b7d8201b88ebdbad6e36b59
FrameAccessor: 5eec95b29b5e9a3afe72a7a2e9ed25b000d3bcc3
MKFoundationKit: 4858fe474ee45f988db5ff1e229d700743e71ed8

COCOAPODS: 0.32.1
COCOAPODS: 0.34.1
38 changes: 18 additions & 20 deletions GraphKit/Pods/BButton/BButton/Classes/BButton.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

94 changes: 31 additions & 63 deletions GraphKit/Pods/BButton/BButton/Classes/BButton.m
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading