новые иконки в OpenBoard

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claudio Valerio 87f1aa0c58 Merge git://anonscm.debian.org/users/gismo/Sankore-3.1 into release-candidate ... 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		12 years ago
..
browser	Merge git://anonscm.debian.org/users/gismo/Sankore-3.1 into release-candidate	12 years ago
UBOEmbedParser.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	12 years ago
UBOEmbedParser.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	12 years ago
UBTrapFlashController.cpp	Merge git://anonscm.debian.org/users/gismo/Sankore-3.1 into release-candidate	12 years ago
UBTrapFlashController.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	12 years ago
UBWebController.cpp	Merge git://anonscm.debian.org/users/gismo/Sankore-3.1 into release-candidate	12 years ago
UBWebController.h	Merge git://anonscm.debian.org/users/gismo/Sankore-3.1 into release-candidate	12 years ago
UBWebKitUtils.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	12 years ago
UBWebKitUtils.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	12 years ago
UBWebPage.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	12 years ago
UBWebPage.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	12 years ago
UBWebPluginWidget.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	12 years ago
UBWebPluginWidget.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	12 years ago
web.pri	Old files from QWebView architecture deleted.	12 years ago