Merge git://anonscm.debian.org/users/gismo/Sankore-3.1 into release-candidate
authorClaudio Valerio <claudio@open-sankore.org>
Thu, 1 Nov 2012 09:18:11 +0000 (10:18 +0100)
committerClaudio Valerio <claudio@open-sankore.org>
Thu, 1 Nov 2012 09:18:11 +0000 (10:18 +0100)
commit87f1aa0c5859fc7ee07b8f9a2937ad3026341e5d
treeba67465cda269fc2dc095c31881057759580dc5e
parent261a8847ad90d295b3ccb17b6e1a9408b3fb755b
parent432d191fcc63c48ace913499ee304c5f3e8a1af2
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
138 files changed:
plugins/cffadaptor/src/UBCFFAdaptor.cpp
plugins/cffadaptor/src/UBCFFAdaptor.h
plugins/cffadaptor/src/UBCFFConstants.h
src/adaptors/UBCFFSubsetAdaptor.cpp
src/adaptors/UBCFFSubsetAdaptor.h
src/adaptors/UBExportFullPDF.cpp
src/adaptors/UBImportDocument.cpp
src/adaptors/UBImportDocument.h
src/adaptors/UBImportPDF.cpp
src/adaptors/UBSvgSubsetAdaptor.cpp
src/adaptors/UBSvgSubsetAdaptor.h
src/adaptors/UBThumbnailAdaptor.cpp
src/adaptors/publishing/UBDocumentPublisher.cpp
src/api/UBLibraryAPI.cpp
src/api/UBWidgetMessageAPI.cpp
src/api/UBWidgetUniboardAPI.cpp
src/board/UBBoardController.cpp
src/board/UBBoardController.h
src/board/UBBoardPaletteManager.cpp
src/board/UBBoardView.cpp
src/board/UBBoardView.h
src/board/UBDrawingController.cpp
src/board/UBDrawingController.h
src/board/UBFeaturesController.cpp
src/board/UBFeaturesController.h
src/core/UB.h
src/core/UBApplication.cpp
src/core/UBApplication.h
src/core/UBApplicationController.cpp
src/core/UBApplicationController.h
src/core/UBDisplayManager.cpp
src/core/UBDocumentManager.cpp
src/core/UBDownloadManager.cpp
src/core/UBDownloadManager.h
src/core/UBPersistenceManager.cpp
src/core/UBPersistenceManager.h
src/core/UBPreferencesController.cpp
src/core/UBPreferencesController.h
src/core/UBSceneCache.cpp
src/core/UBSceneCache.h
src/core/UBSettings.cpp
src/core/UBSettings.h
src/core/main.cpp
src/customWidgets/UBMediaWidget.cpp
src/desktop/UBDesktopAnnotationController.cpp
src/desktop/UBDesktopAnnotationController.h
src/desktop/UBDesktopPalette.cpp
src/desktop/UBDesktopPalette.h
src/desktop/UBDesktopPropertyPalette.h
src/document/UBDocumentContainer.cpp
src/document/UBDocumentContainer.h
src/document/UBDocumentController.cpp
src/document/UBDocumentController.h
src/domain/UBGraphicsDelegateFrame.cpp
src/domain/UBGraphicsDelegateFrame.h
src/domain/UBGraphicsGroupContainerItem.cpp
src/domain/UBGraphicsGroupContainerItem.h
src/domain/UBGraphicsItemDelegate.cpp
src/domain/UBGraphicsItemDelegate.h
src/domain/UBGraphicsItemGroupUndoCommand.cpp
src/domain/UBGraphicsItemUndoCommand.cpp
src/domain/UBGraphicsItemUndoCommand.h
src/domain/UBGraphicsMediaItem.cpp
src/domain/UBGraphicsMediaItem.h
src/domain/UBGraphicsMediaItemDelegate.cpp
src/domain/UBGraphicsPDFItem.cpp
src/domain/UBGraphicsPDFItem.h
src/domain/UBGraphicsPixmapItem.cpp
src/domain/UBGraphicsPixmapItem.h
src/domain/UBGraphicsPolygonItem.cpp
src/domain/UBGraphicsPolygonItem.h
src/domain/UBGraphicsProxyWidget.cpp
src/domain/UBGraphicsProxyWidget.h
src/domain/UBGraphicsScene.cpp
src/domain/UBGraphicsScene.h
src/domain/UBGraphicsStrokesGroup.cpp
src/domain/UBGraphicsStrokesGroup.h
src/domain/UBGraphicsSvgItem.cpp
src/domain/UBGraphicsSvgItem.h
src/domain/UBGraphicsTextItem.cpp
src/domain/UBGraphicsTextItem.h
src/domain/UBGraphicsTextItemDelegate.cpp
src/domain/UBGraphicsTextItemDelegate.h
src/domain/UBGraphicsWidgetItem.cpp
src/domain/UBGraphicsWidgetItem.h
src/domain/UBGraphicsWidgetItemDelegate.cpp
src/domain/UBItem.cpp
src/domain/UBItem.h
src/frameworks/UBCoreGraphicsScene.cpp
src/frameworks/UBCoreGraphicsScene.h
src/frameworks/UBFileSystemUtils.cpp
src/frameworks/UBFileSystemUtils.h
src/frameworks/UBGeometryUtils.cpp
src/frameworks/UBGeometryUtils.h
src/frameworks/UBPlatformUtils.h
src/frameworks/UBPlatformUtils_linux.cpp
src/gui/UBDocumentNavigator.cpp
src/gui/UBDocumentTreeWidget.cpp
src/gui/UBFeaturesWidget.cpp
src/gui/UBFeaturesWidget.h
src/gui/UBFloatingPalette.cpp
src/gui/UBFloatingPalette.h
src/gui/UBKeyboardPalette.cpp
src/gui/UBKeyboardPalette_mac.cpp
src/gui/UBScreenMirror.cpp
src/gui/UBTeacherGuideWidget.cpp
src/gui/UBTeacherGuideWidget.h
src/gui/UBTeacherGuideWidgetsTools.cpp
src/gui/UBTeacherGuideWidgetsTools.h
src/gui/UBThumbnailWidget.cpp
src/gui/UBToolWidget.cpp
src/gui/UBToolWidget.h
src/pdf-merger/Utils.cpp
src/pdf/PDFRenderer.cpp
src/podcast/youtube/UBYouTubePublisher.cpp
src/podcast/youtube/UBYouTubePublisher.h
src/tools/UBAbstractDrawRuler.cpp
src/tools/UBAbstractDrawRuler.h
src/tools/UBGraphicsCache.cpp
src/tools/UBGraphicsCache.h
src/tools/UBGraphicsCompass.cpp
src/tools/UBGraphicsCompass.h
src/tools/UBGraphicsCurtainItem.cpp
src/tools/UBGraphicsCurtainItem.h
src/tools/UBGraphicsCurtainItemDelegate.h
src/tools/UBGraphicsProtractor.h
src/tools/UBGraphicsRuler.cpp
src/tools/UBGraphicsRuler.h
src/tools/UBGraphicsTriangle.cpp
src/tools/UBGraphicsTriangle.h
src/tools/UBToolsManager.cpp
src/tools/UBToolsManager.h
src/web/UBTrapFlashController.cpp
src/web/UBWebController.cpp
src/web/UBWebController.h
src/web/browser/WBBrowserWindow.cpp
src/web/browser/WBUrlLineEdit.cpp
src/web/browser/WBWebTrapWebView.cpp