• 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
sankore.qrc 17.5 KB