Reviewing merge request #1562: Python script which generates Nasal API

Updated version of the script.

Requested by: Adrian Musceac
Status: Merged
Source repository: kantooons-flightgear:nasal_api
Target repository: flightgear:next
Created at: February 3rd, 2012 17:20

Commits that would be merged:

Version 1

Version 1

62dfa8c
2c5a13c

python script which generates $FGROOT/Nasal API documentation

02288ce

updated API script

Showing

Showing 62dfa8c-2c5a13c

Comments
Include comments entered inline

Pushed new version 1

Adrian Musceac | 2012-02-03 17:20:33 UTC

→ State changed from Open to Merged

Merged!
I changed the name of the script though to “nasal_api_doc.py”. I was a bit confused at first when I saw “nasal_api”, since I expected something else ;–). Hope the change is ok with you.

Thanks,
Thorsten

Thorsten B. | 2012-03-04 18:53:25 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/1562

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/fg/flightgear.git \
  refs/merge-requests/1562

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit next..merge-requests/1562

# To apply the changes to your branch:
git checkout next
git merge merge-requests/1562
git push origin next

Reviewing merge request #1562: Python script which generates Nasal API

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline