Screwed up merge cleanup
Screwed up merge cleanup

kd0aij/qgroundcontrol,hejunbok/qgroundcontrol,TheIronBorn/qgroundcontrol,cfelipesouza/qgroundcontrol,mihadyuk/qgroundcontrol,nado1688/qgroundcontrol,devbharat/qgroundcontrol,UAVenture/qgroundcontrol,jy723/qgroundcontrol,LIKAIMO/qgroundcontrol,iidioter/qgroundcontrol,catch-twenty-two/qgroundcontrol,nado1688/qgroundcontrol,Hunter522/qgroundcontrol,BMP-TECH/qgroundcontrol,greenoaktree/qgroundcontrol,remspoor/qgroundcontrol,jy723/qgroundcontrol,remspoor/qgroundcontrol,remspoor/qgroundcontrol,CornerOfSkyline/qgroundcontrol,caoxiongkun/qgroundcontrol,caoxiongkun/qgroundcontrol,hejunbok/qgroundcontrol,caoxiongkun/qgroundcontrol,dagoodma/qgroundcontrol,catch-twenty-two/qgroundcontrol,CornerOfSkyline/qgroundcontrol,nado1688/qgroundcontrol,devbharat/qgroundcontrol,hejunbok/qgroundcontrol,ethz-asl/qgc_asl,dagoodma/qgroundcontrol,UAVenture/qgroundcontrol,TheIronBorn/qgroundcontrol,RedoXyde/PX4_qGCS,catch-twenty-two/qgroundcontrol,UAVenture/qgroundcontrol,CornerOfSkyline/qgroundcontrol,RedoXyde/PX4_qGCS,LIKAIMO/qgroundcontrol,BMP-TECH/qgroundcontrol,BMP-TECH/qgroundcontrol,mihadyuk/qgroundcontrol,caoxiongkun/qgroundcontrol,Hunter522/qgroundcontrol,iidioter/qgroundcontrol,hejunbok/qgroundcontrol,scott-eddy/qgroundcontrol,catch-twenty-two/qgroundcontrol,scott-eddy/qgroundcontrol,LIKAIMO/qgroundcontrol,nado1688/qgroundcontrol,Hunter522/qgroundcontrol,nado1688/qgroundcontrol,caoxiongkun/qgroundcontrol,lis-epfl/qgroundcontrol,josephlewis42/UDenverQGC2,greenoaktree/qgroundcontrol,dagoodma/qgroundcontrol,devbharat/qgroundcontrol,mihadyuk/qgroundcontrol,CornerOfSkyline/qgroundcontrol,RedoXyde/PX4_qGCS,fizzaly/qgroundcontrol,LIKAIMO/qgroundcontrol,TheIronBorn/qgroundcontrol,ethz-asl/qgc_asl,ethz-asl/qgc_asl,nado1688/qgroundcontrol,fizzaly/qgroundcontrol,catch-twenty-two/qgroundcontrol,fizzaly/qgroundcontrol,RedoXyde/PX4_qGCS,hejunbok/qgroundcontrol,scott-eddy/qgroundcontrol,catch-twenty-two/qgroundcontrol,remspoor/qgroundcontrol,iidioter/qgroundcontrol,scott-eddy/qgroundcontrol,LIKAIMO/qgroundcontrol,kd0aij/qgroundcontrol,greenoaktree/qgroundcontrol,devbharat/qgroundcontrol,TheIronBorn/qgroundcontrol,dagoodma/qgroundcontrol,iidioter/qgroundcontrol,jy723/qgroundcontrol,josephlewis42/UDenverQGC2,Hunter522/qgroundcontrol,jy723/qgroundcontrol,iidioter/qgroundcontrol,remspoor/qgroundcontrol,CornerOfSkyline/qgroundcontrol,fizzaly/qgroundcontrol,UAVenture/qgroundcontrol,BMP-TECH/qgroundcontrol,ethz-asl/qgc_asl,BMP-TECH/qgroundcontrol,mihadyuk/qgroundcontrol,kd0aij/qgroundcontrol,remspoor/qgroundcontrol,josephlewis42/UDenverQGC2,dagoodma/qgroundcontrol,scott-eddy/qgroundcontrol,cfelipesouza/qgroundcontrol,caoxiongkun/qgroundcontrol,UAVenture/qgroundcontrol,scott-eddy/qgroundcontrol,Hunter522/qgroundcontrol,devbharat/qgroundcontrol,BMP-TECH/qgroundcontrol,kd0aij/qgroundcontrol,ethz-asl/qgc_asl,devbharat/qgroundcontrol,josephlewis42/UDenverQGC2,lis-epfl/qgroundcontrol,mihadyuk/qgroundcontrol,greenoaktree/qgroundcontrol,iidioter/qgroundcontrol,LIKAIMO/qgroundcontrol,fizzaly/qgroundcontrol,cfelipesouza/qgroundcontrol,TheIronBorn/qgroundcontrol,RedoXyde/PX4_qGCS,Hunter522/qgroundcontrol,UAVenture/qgroundcontrol,kd0aij/qgroundcontrol,mihadyuk/qgroundcontrol,cfelipesouza/qgroundcontrol,jy723/qgroundcontrol,cfelipesouza/qgroundcontrol,cfelipesouza/qgroundcontrol,RedoXyde/PX4_qGCS,jy723/qgroundcontrol,lis-epfl/qgroundcontrol,dagoodma/qgroundcontrol,greenoaktree/qgroundcontrol,kd0aij/qgroundcontrol,greenoaktree/qgroundcontrol,lis-epfl/qgroundcontrol,TheIronBorn/qgroundcontrol,hejunbok/qgroundcontrol,fizzaly/qgroundcontrol,CornerOfSkyline/qgroundcontrol,lis-epfl/qgroundcontrol