Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qgroundcontrol
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

fccdc662

Commit fccdc662 authored 10 years ago by Thomas Gubler

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/mavlinksubmodule_joystickinput' into...

Merge remote-tracking branch 'upstream/mavlinksubmodule_joystickinput' into mavlinksubmodule_joystickinput

Conflicts:
	src/uas/UAS.cc

parents 465c19c7 ac3d0c9f

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

src/uas/UAS.cc 83 additions, 103 deletions

src/uas/UAS.cc
src/ui/JoystickWidget.ui 1 addition, 8 deletions

src/ui/JoystickWidget.ui

with 84 additions and 111 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment