BeRo1985/flre

Add some documentation for functions #51

Open

Bi0T1N wants to merge 1 commit from Bi0T1N/documentation into master

Bi0T1N commented

2020-03-13 22:32:06 +00:00

(Migrated from github.com)

the documentation uses the PasDoc format which allows the
generating of different output files like HTML or PDF
see https://github.com/pasdoc/pasdoc

addresses #41

the documentation uses the PasDoc format which allows the generating of different output files like HTML or PDF see https://github.com/pasdoc/pasdoc addresses #41

This pull request has changes conflicting with the target branch.

src/FLRE.pas

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'Add some documentation for functions' (#51) from Bi0T1N/documentation into master

Merge commit body

Reviewed-on: https://git.rosseaux.net/BeRo1985/flre/pulls/51

Merge pull request 'Add some documentation for functions' (#51) from Bi0T1N/documentation into master

Reviewed-on: https://git.rosseaux.net/BeRo1985/flre/pulls/51

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin Bi0T1N/documentation:Bi0T1N/documentation

git switch Bi0T1N/documentation

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff Bi0T1N/documentation

git switch Bi0T1N/documentation

git rebase master

git switch master

git merge --ff-only Bi0T1N/documentation

git switch Bi0T1N/documentation

git rebase master

git switch master

git merge --no-ff Bi0T1N/documentation

git switch master

git merge --squash Bi0T1N/documentation