• dogmaphobic's avatar
    Merge branch 'master' into issue1182 · 18a2d165
    dogmaphobic authored
    Conflicts:
    	src/QGCApplication.cc
    	src/QGCFileDialog.cc
    	src/QGCFileDialog.h
    	src/ui/MainWindow.cc
    	src/ui/QGCBaseParamWidget.cc
    	src/ui/WaypointList.cc
    	src/ui/designer/QGCToolWidget.cc
    	src/ui/linechart/LinechartWidget.cc
    
    Merging master
    Applied changes to file open/save dialogs.
    18a2d165
Name
Last commit
Last update
..
CameraParams.cc Loading commit data...
CameraParams.h Loading commit data...
GCManipulator.cc Loading commit data...
GCManipulator.h Loading commit data...
GLOverlayGeode.cc Loading commit data...
GLOverlayGeode.h Loading commit data...
GlobalViewParams.cc Loading commit data...
GlobalViewParams.h Loading commit data...
HUDScaleGeode.cc Loading commit data...
HUDScaleGeode.h Loading commit data...
ImageWindowGeode.cc Loading commit data...
ImageWindowGeode.h Loading commit data...
Imagery.cc Loading commit data...
Imagery.h Loading commit data...
ImageryParamDialog.cc Loading commit data...
ImageryParamDialog.h Loading commit data...
ObstacleGroupNode.cc Loading commit data...
ObstacleGroupNode.h Loading commit data...
Pixhawk3DWidget.cc Loading commit data...
Pixhawk3DWidget.h Loading commit data...
PixhawkCheetahNode.cc Loading commit data...
PixhawkCheetahNode.h Loading commit data...
Q3DWidget.cc Loading commit data...
Q3DWidget.h Loading commit data...
Q3DWidgetFactory.cc Loading commit data...
Q3DWidgetFactory.h Loading commit data...
QGCGlut.h Loading commit data...
QGCGoogleEarthView.cc Loading commit data...
QGCGoogleEarthView.h Loading commit data...
QGCGoogleEarthView.ui Loading commit data...
QGCWebPage.cc Loading commit data...
QGCWebPage.h Loading commit data...
QMap3D.h Loading commit data...
SystemContainer.cc Loading commit data...
SystemContainer.h Loading commit data...
SystemGroupNode.cc Loading commit data...
SystemGroupNode.h Loading commit data...
SystemViewParams.cc Loading commit data...
SystemViewParams.h Loading commit data...
TerrainParamDialog.cc Loading commit data...
TerrainParamDialog.h Loading commit data...
Texture.cc Loading commit data...
Texture.h Loading commit data...
TextureCache.cc Loading commit data...
TextureCache.h Loading commit data...
ViewParamWidget.cc Loading commit data...
ViewParamWidget.h Loading commit data...
WaypointGroupNode.cc Loading commit data...
WaypointGroupNode.h Loading commit data...
WebImage.cc Loading commit data...
WebImage.h Loading commit data...
WebImageCache.cc Loading commit data...
WebImageCache.h Loading commit data...
gpl.cc Loading commit data...
gpl.h Loading commit data...