• 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
plugins Loading commit data...
resources Loading commit data...
src Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
ChangeLog.html Loading commit data...
JournalDesModifications.pdf Loading commit data...
Open-Sankore.packproj Loading commit data...
README.txt Loading commit data...
ReleaseNotes.pdf Loading commit data...
Sankore 3.1.iss Loading commit data...
Sankore-Licence.txt Loading commit data...
Sankore_3.1.pro Loading commit data...
buildDebianPackage Loading commit data...
gpl.txt Loading commit data...
lgpl.txt Loading commit data...
lgplC++StandardHeaderFile.txt Loading commit data...
release.linux.sh Loading commit data...
release.macx.sh Loading commit data...
release.win7.vc9.64.bat Loading commit data...
release.win7.vc9.bat Loading commit data...