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

Add doxyfile (backport #279) #283

Merged
merged 2 commits into from
Apr 20, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 20, 2024

Needed for #278 on all branches for multiversion.


This is an automatic backport of pull request #279 done by Mergify.

* Add doxyfile

* Update doxyfile and add logo

* Rename api.rst and add mainpage.md

(cherry picked from commit 481e732)

# Conflicts:
#	index.rst
Copy link
Contributor Author

mergify bot commented Apr 20, 2024

Cherry-pick of 481e732 has failed:

On branch mergify/bp/iron/pr-279
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit 481e732.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   doc/Doxyfile
	renamed:    doc/api/api.rst -> doc/api_list/api_list.rst
	new file:   doc/api_list/mainpage.md
	new file:   images/logo_ros-controls_small.png

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   index.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Apr 20, 2024
@mergify mergify bot mentioned this pull request Apr 20, 2024
@christophfroehlich christophfroehlich merged commit 5d004b9 into iron Apr 20, 2024
3 of 4 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/iron/pr-279 branch April 20, 2024 10:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant