новые иконки в OpenBoard

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Yimgo 578b46443d Merge remote-tracking branch 'upstream/develop' into aristo_tool ... 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		12 years ago
..
adaptors	bad workaround for issue 1125	12 years ago
api	SANKORE-1026	12 years ago
board	Merge remote-tracking branch 'upstream/develop' into aristo_tool	12 years ago
core	Merge remote-tracking branch 'upstream/develop' into aristo_tool	12 years ago
customWidgets	Fixed issue 1032	12 years ago
desktop	Eraising elements	12 years ago
document	Merge remote-tracking branch 'origin/develop' into claudio-dev	12 years ago
domain	Merge remote-tracking branch 'upstream/develop' into aristo_tool	12 years ago
frameworks	Virtual Keyboard under Mac OS 10.7: switching locales	12 years ago
globals	removed globalStyleSheet()	13 years ago
gui	Merge branch 'develop' into shiba-dev	12 years ago
interfaces	added good header	12 years ago
network	added good header	12 years ago
pdf	added good header	12 years ago
pdf-merger	Minor changes	12 years ago
podcast	MAC warnings fix	12 years ago
tools	Merge remote-tracking branch 'upstream/develop' into aristo_tool	12 years ago
transition	added good header	12 years ago
web	fixed issue 1083	12 years ago