Skip to content

O
OpenBoard
Switch branch/tag
History Find file
  • Yimgo's avatar
    Merge remote-tracking branch 'upstream/develop' into aristo_tool · 578b4644
    Yimgo authored 
    Conflicts:
	resources/inDevelopmentWidgets/Balance.wgt/css/images/delete.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/graduations.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/pivot.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/scale.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/scales.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/weight-add.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/weight.png
    578b4644
Name
Last commit
 Last update
..
Mask_specification.odt Loading commit data...
UBAbstractDrawRuler.cpp Loading commit data...
UBAbstractDrawRuler.h Loading commit data...
UBGraphicsAristo.cpp Loading commit data...
UBGraphicsAristo.h Loading commit data...
UBGraphicsCache.cpp Loading commit data...
UBGraphicsCache.h Loading commit data...
UBGraphicsCompass.cpp Loading commit data...
UBGraphicsCompass.h Loading commit data...
UBGraphicsCurtainItem.cpp Loading commit data...
UBGraphicsCurtainItem.h Loading commit data...
UBGraphicsCurtainItemDelegate.cpp Loading commit data...
UBGraphicsCurtainItemDelegate.h Loading commit data...
UBGraphicsProtractor.cpp Loading commit data...
UBGraphicsProtractor.h Loading commit data...
UBGraphicsRuler.cpp Loading commit data...
UBGraphicsRuler.h Loading commit data...
UBGraphicsTriangle.cpp Loading commit data...
UBGraphicsTriangle.h Loading commit data...
UBToolsManager.cpp Loading commit data...
UBToolsManager.h Loading commit data...
tools.pri Loading commit data...