Skip to content
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.

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

Carthage support #11

Merged
merged 3 commits into from Feb 16, 2016
Merged

Carthage support #11

merged 3 commits into from Feb 16, 2016

Conversation

@chuganzy
Copy link
Contributor

chuganzy commented Jan 5, 2016

As titled. Fixes #8 and #10.

@reallyseth reallyseth mentioned this pull request Jan 6, 2016
@Ekhoo
Copy link
Owner

Ekhoo commented Feb 16, 2016

Hello, thank you for your PR, I will test it and if it's ok I will merge it :)

@Ekhoo
Copy link
Owner

Ekhoo commented Feb 16, 2016

Hello, there are some conflitcts with your PR. If you want to fix it you can, otherwise I will merge #12. Tell me what you prefer :)

# Conflicts:
#	Device.xcodeproj/project.pbxproj
@chuganzy
Copy link
Contributor Author

chuganzy commented Feb 16, 2016

Done!

@Ekhoo
Copy link
Owner

Ekhoo commented Feb 16, 2016

Oh great :) Thank you very much :)

@Ekhoo
Copy link
Owner

Ekhoo commented Feb 16, 2016

I merge ! And I will build a new release today

Ekhoo added a commit that referenced this pull request Feb 16, 2016
@Ekhoo Ekhoo merged commit f7218fc into Ekhoo:master Feb 16, 2016
@Ekhoo Ekhoo mentioned this pull request Feb 16, 2016
@chuganzy
Copy link
Contributor Author

chuganzy commented Feb 16, 2016

👍

@Ekhoo
Copy link
Owner

Ekhoo commented Feb 16, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.