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

Configure needs to find libsodium headers. #571

Merged
merged 1 commit into from
Aug 30, 2017

Conversation

JamesC1
Copy link

@JamesC1 JamesC1 commented Jul 28, 2017

Add soft-links for them, in the places that it expects.


This change is Reviewable

@CLAassistant
Copy link

CLAassistant commented Jul 28, 2017

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@nurupo
Copy link
Member

nurupo commented Jul 28, 2017

:lgtm_strong:


Reviewed 1 of 1 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@robinlinden
Copy link
Member

:lgtm_strong: Can you check the box that allows me to rebase this or rebase on master yourself?


Reviewed 1 of 1 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved, some commit checks failed.


Comments from Reviewable

@robinlinden robinlinden modified the milestones: v0.1.10, v0.1.11 Aug 5, 2017
@JamesC1
Copy link
Author

JamesC1 commented Aug 7, 2017

I think that the relevant tick box is "Allow edits from maintainers" on the right. I have ticked it.

I have had a go at rebasing. It ended up requiring a 'git push -f', to get github to accept the rewritten history. Is that normal?

@robinlinden
Copy link
Member

Yeah, that's normal. GitHub requires you to confirm you know what you're doing when you rewrite history.
Thanks for rebasing!

@robinlinden
Copy link
Member

Please enable the checkbox "Allow edits from maintainers." on the bottom right, or rebase again. This repo only does fast-forward merges, so this has to be ahead of master when I go ahead and merge it.

@JamesC1
Copy link
Author

JamesC1 commented Aug 17, 2017

Hi Robin,

I think that's the tick box on the right side of this page: #571
which might be visible only to me. It's currently ticked. I think that it has unticked itself at least once.

I'm on a strange machine, so I've had a hairy go at rebasing. It didn't satisfy the box of checks, so I clicked the "Update branch" button, but I don't know what it did :-)

Regards,
James.

@robinlinden robinlinden force-pushed the oxs_10.6_build branch 3 times, most recently from 07dd47f to 589c483 Compare August 27, 2017 22:40
Add soft-links for them, in the places that it expects.
@robinlinden robinlinden merged commit 4ceaad5 into TokTok:master Aug 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants