src/ui/JoystickAxis.cc · 24af948fa30fcfdd0df43464028ab012ad65acae · Valentin Platzgummer / qgroundcontrol

Jun 17, 2013

Merge branch 'joystick_commands' of github.com:Susurrus/qgroundcontrol into joystick_commands · 24af948f

Bryant authored Jun 17, 2013

Conflicts:
	src/input/JoystickInput.cc
	src/input/JoystickInput.h
	src/ui/JoystickAxis.cc
	src/ui/JoystickAxis.h
	src/ui/JoystickAxis.ui
	src/ui/JoystickWidget.cc

24af948f

Merge branch 'joystick_commands' of github.com:Susurrus/qgroundcontrol into joystick_commands

Bryant authored Jun 17, 2013

Conflicts:
	src/input/JoystickInput.cc
	src/input/JoystickInput.h
	src/ui/JoystickAxis.cc
	src/ui/JoystickAxis.h
	src/ui/JoystickAxis.ui
	src/ui/JoystickWidget.cc