• 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
resources Loading commit data...
src Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
Open-Sankore.packproj Loading commit data...
README.txt Loading commit data...
Sankore 3.1.iss Loading commit data...
Sankore-Licence.txt Loading commit data...
Sankore_3.1.pro Loading commit data...
buildDebianPackage Loading commit data...
gpl.txt Loading commit data...
lgpl.txt Loading commit data...
lgplC++StandardHeaderFile.txt Loading commit data...
release.linux.sh Loading commit data...
release.macx.sh Loading commit data...
release.win7.vc9.64.bat Loading commit data...
release.win7.vc9.bat Loading commit data...