Skip to content
Snippets Groups Projects
Commit faf51754 authored by Adam M Rivera's avatar Adam M Rivera
Browse files

Merge branch 'master' of https://code.google.com/p/ardupilot-mega into param-suffix 

Conflicts:
	Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
	Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataConstants.cs
	Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataParser.cs
	Tools/ArdupilotMegaPlanner/app.config
parents 6f07bd99 c6d91a5b
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 136 additions and 9 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment