src/gui/UBThumbnailWidget.cpp · 05847f6c67575e1d5797d38f58e62ea7632fca49 · lifo / Nicolas Ollinger / OpenBoard

Merge git://anonscm.debian.org/users/gismo/Sankore-3.1 into release-candidate · 87f1aa0c

Claudio Valerio authored Nov 01, 2012

Conflicts:
	src/desktop/UBDesktopEraserPalette.cpp
	src/desktop/UBDesktopEraserPalette.h
	src/desktop/UBDesktopMarkerPalette.cpp
	src/desktop/UBDesktopMarkerPalette.h
	src/desktop/UBDesktopPenPalette.cpp
	src/domain/UBGraphicsWebView.cpp
	src/domain/UBGraphicsWebView.h
	src/gui/UBThumbnailWidget.cpp

87f1aa0c

UBThumbnailWidget.cpp 31.8 KB

Replace UBThumbnailWidget.cpp