resources/library/applications · ea76aefc64ec4fd69702f3de590b3c9e83b87db0 · lifo / Nicolas Ollinger / OpenBoard

Merge remote-tracking branch 'remotes/origin/Sankore-1.40' · ff32e977

Claudio Valerio authored May 08, 2012

Conflicts:
	src/board/UBBoardView.cpp
	src/domain/UBGraphicsItemDelegate.cpp
	src/domain/UBGraphicsItemDelegate.h
	src/domain/UBGraphicsPixmapItem.h
	src/domain/UBGraphicsVideoItem.cpp

ff32e977

Name	Last commit	Last update
..
Calculatrice.wgt		Loading commit data...
Cellule.wgt		Loading commit data...
Composant Web.wgt		Loading commit data...
Edit Html.wgt		Loading commit data...
GeoInfo.wgt		Loading commit data...
GoogleMap.wgt		Loading commit data...
Grapheur 3D.wgt		Loading commit data...
Minuteur.wgt		Loading commit data...
Navigateur Web.wgt		Loading commit data...
Notes.wgt		Loading commit data...
Nuancier.wgt		Loading commit data...
Sél vidéo.wgt		Loading commit data...
Wikipedia.wgt		Loading commit data...
Wiktionnaire.wgt		Loading commit data...