src/board · ff32e97781f4ecdf03de81bfa500faf7b919ae26 · 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
..
UBBoardController.cpp		Loading commit data...
UBBoardController.h		Loading commit data...
UBBoardPaletteManager.cpp		Loading commit data...
UBBoardPaletteManager.h		Loading commit data...
UBBoardView.cpp		Loading commit data...
UBBoardView.h		Loading commit data...
UBDrawingController.cpp		Loading commit data...
UBDrawingController.h		Loading commit data...
UBFeaturesController.cpp		Loading commit data...
UBFeaturesController.h		Loading commit data...
UBLibraryController.cpp		Loading commit data...
UBLibraryController.h		Loading commit data...
board.pri		Loading commit data...