Skip to content

saml21: add README stating origin for SAML21 CMSIS includes#6240

Merged
haukepetersen merged 1 commit intoRIOT-OS:masterfrom
ant9000:saml21_integration
Jan 12, 2017
Merged

saml21: add README stating origin for SAML21 CMSIS includes#6240
haukepetersen merged 1 commit intoRIOT-OS:masterfrom
ant9000:saml21_integration

Conversation

@ant9000
Copy link
Copy Markdown
Contributor

@ant9000 ant9000 commented Dec 19, 2016 •
edited by haukepetersen
Loading

Just a short addition to #6223 - a README file with information about the includes origin.

Antonio

@ant9000 ant9000 mentioned this pull request Dec 19, 2016
Merged
@OlegHahm OlegHahm self-assigned this Dec 22, 2016
@OlegHahm OlegHahm added Platform: ARM Platform: This PR/issue effects ARM-based platforms Area: doc Area: Documentation Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer labels Dec 22, 2016
OlegHahm
OlegHahm approved these changes Dec 22, 2016
View reviewed changes
Copy link
Copy Markdown
Member

@OlegHahm OlegHahm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

@OlegHahm OlegHahm added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Dec 22, 2016
@ant9000 ant9000 closed this Jan 10, 2017
@ant9000 ant9000 deleted the saml21_integration branch January 10, 2017 11:36
@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Jan 10, 2017

Why did you close this?

@ant9000 ant9000 restored the saml21_integration branch January 10, 2017 12:41
@ant9000
Copy link
Copy Markdown
Contributor Author

ant9000 commented Jan 10, 2017

Did not intend to - I was just tiding up my repo and now that you ask, I realize that PRs are based on branches and not commits. I restored the branch, sorry for the mess.

Anyhow, this PR was still unmerged and the same commit is also included in - and then superseded by - PR #6242 - so maybe you could label it as closed anyway.

@ant9000 ant9000 reopened this Jan 10, 2017
@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Jan 10, 2017

Since #6242 seems to be about to be merged, waiting for it and closing this PR may make sense, agreed.

@haukepetersen haukepetersen merged commit 11b6f47 into RIOT-OS:master Jan 12, 2017
@ant9000 ant9000 deleted the saml21_integration branch January 12, 2017 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@OlegHahm OlegHahm OlegHahm approved these changes

Assignees

@OlegHahm OlegHahm

Labels

Area: doc Area: Documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Platform: ARM Platform: This PR/issue effects ARM-based platforms

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ant9000 @OlegHahm @haukepetersen