• 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
..
adaptors Loading commit data...
api Loading commit data...
board Loading commit data...
core Loading commit data...
customWidgets Loading commit data...
desktop Loading commit data...
document Loading commit data...
domain Loading commit data...
frameworks Loading commit data...
gui Loading commit data...
interfaces Loading commit data...
network Loading commit data...
pdf Loading commit data...
pdf-merger Loading commit data...
podcast Loading commit data...
softwareupdate Loading commit data...
tools Loading commit data...
transition Loading commit data...
web Loading commit data...