• 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
..
customizations Loading commit data...
etc Loading commit data...
fonts Loading commit data...
forms Loading commit data...
i18n Loading commit data...
images Loading commit data...
library Loading commit data...
linux Loading commit data...
macx Loading commit data...
podcast Loading commit data...
style Loading commit data...
webbrowser Loading commit data...
win Loading commit data...
www Loading commit data...
sankore.qrc Loading commit data...
style.qss Loading commit data...