src/board · ab33697595e81aa70abe2c2314777707242b66a0 · lifo / Nicolas Ollinger / OpenBoard · GitLab

History Find file

Merge remote-tracking branch 'remotes/origin/release-1.30' · ab336975

Claudio Valerio authored Oct 26, 2011

Conflicts:
	resources/sankore.qrc
	src/board/UBBoardPaletteManager.cpp
	src/board/UBBoardPaletteManager.h
	src/gui/UBTeacherBarWidget.cpp

ab336975

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...
UBLibraryController.cpp		Loading commit data...
UBLibraryController.h		Loading commit data...
board.pri		Loading commit data...