• Claudio Valerio's avatar
    Merge remote-tracking branch 'origin/Bett-2012' · fd3e8ddb
    Claudio Valerio authored
    Conflicts:
    	Sankore_3.1.pro
    	src/board/UBBoardPaletteManager.cpp
    	src/board/UBBoardView.cpp
    	src/document/UBDocumentProxy.cpp
    	src/gui/UBDockPaletteWidget.cpp
    	src/gui/UBTeacherBarWidget.h
    	src/web/UBWebController.h
    fd3e8ddb
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...