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
..
backgroundPalette Loading commit data...
cursors Loading commit data...
erasePalette Loading commit data...
extraPalette Loading commit data...
flags Loading commit data...
libpalette Loading commit data...
licenses Loading commit data...
print Loading commit data...
stylusPalette Loading commit data...
teacherGuide Loading commit data...
toolPalette Loading commit data...
toolbar Loading commit data...
virtual.keyboard Loading commit data...
addItemToCurrentPage.svg Loading commit data...
addItemToLibrary.svg Loading commit data...
addItemToNewPage.svg Loading commit data...
angleMarker.svg Loading commit data...
bigUniboard.png Loading commit data...
cache_circle.png Loading commit data...
cache_close.png Loading commit data...
cache_open.png Loading commit data...
cache_square.png Loading commit data...
close.svg Loading commit data...
closeDisabled.svg Loading commit data...
closeTool.svg Loading commit data...
color.svg Loading commit data...
currentDocument.png Loading commit data...
decrease.svg Loading commit data...
defaultWidgetIcon.png Loading commit data...
down_arrow.png Loading commit data...
download_close.png Loading commit data...
download_open.png Loading commit data...
duplicate.svg Loading commit data...
duplicateDisabled.svg Loading commit data...
duration1.png Loading commit data...
duration2.png Loading commit data...
duration3.png Loading commit data...
edit-mode.png Loading commit data...
edit-mode.svg Loading commit data...
eyeClosed.svg Loading commit data...
eyeOpened.svg Loading commit data...
favorites.png Loading commit data...
flash.svg Loading commit data...
folder.png Loading commit data...
font.svg Loading commit data...
frozen.svg Loading commit data...
hflipTool.svg Loading commit data...
home.svg Loading commit data...
increase.svg Loading commit data...
left_arrow.png Loading commit data...
library_close.png Loading commit data...
library_open.png Loading commit data...
locked.svg Loading commit data...
menu.svg Loading commit data...
menuDisabled.svg Loading commit data...
minus.svg Loading commit data...
moveUp.svg Loading commit data...
moveUpDisabled.svg Loading commit data...
myContent.png Loading commit data...
myFolder.png Loading commit data...
navig_arrow.png Loading commit data...
online.png Loading commit data...
pages_close.png Loading commit data...
pages_open.png Loading commit data...
paletteLibrary.png Loading commit data...
paletteNavigator.png Loading commit data...
pause.svg Loading commit data...
pin.svg Loading commit data...
play.svg Loading commit data...
plus.svg Loading commit data...
reload.svg Loading commit data...
resetAngle.svg Loading commit data...
resetTool.svg Loading commit data...
resize.svg Loading commit data...
resizeBottom.svg Loading commit data...
resizeButton.svg Loading commit data...
resizeCompass.svg Loading commit data...
resizeLeft.svg Loading commit data...
resizeRight.svg Loading commit data...
resizeRuler.svg Loading commit data...
resizeTool.svg Loading commit data...
resizeTop.svg Loading commit data...
right_arrow.png Loading commit data...
rotate.svg Loading commit data...
rotateProtractor.svg Loading commit data...
rotateTool.svg Loading commit data...
save.png Loading commit data...
save.svg Loading commit data...
shape.png Loading commit data...
soundOff.svg Loading commit data...
soundOn.svg Loading commit data...
stop.svg Loading commit data...
tab_mask.png Loading commit data...
teacher_close.png Loading commit data...
teacher_close_disabled.png Loading commit data...
teacher_open.png Loading commit data...
teacher_open_disabled.png Loading commit data...
tools.png Loading commit data...
toque.png Loading commit data...
trash.png Loading commit data...
unfrozen.svg Loading commit data...
uniboard.png Loading commit data...
unlocked.svg Loading commit data...
unpin.svg Loading commit data...
up_arrow.png Loading commit data...
vflipTool.svg Loading commit data...
z_layer_down.svg Loading commit data...
z_layer_up.svg Loading commit data...