Files · 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
plugins/cffadaptor		Loading commit data...
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...
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...