src/web/browser · e4099ee77cbbe6de76d67c4c2b8dfedeaecffaad · lifo / Nicolas Ollinger / OpenBoard

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

Claudio Valerio authored 12 years ago

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

Name	Last commit	Last update
..
WBBrowserWindow.cpp	Merge git://anonscm.debian.org/users/gismo/Sankore-3.1 into release-candidate	12 years ago
WBBrowserWindow.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBChaseWidget.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBChaseWidget.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBDownloadManager.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBDownloadManager.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBEditTableView.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBEditTableView.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBHistory.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBHistory.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBModelMenu.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBModelMenu.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBSearchLineEdit.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBSearchLineEdit.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBSqueezeLabel.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBSqueezeLabel.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBTabWidget.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBTabWidget.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBToolBarSearch.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBToolBarSearch.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBUrlLineEdit.cpp	Merge git://anonscm.debian.org/users/gismo/Sankore-3.1 into release-candidate	12 years ago
WBUrlLineEdit.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBWebTrapWebView.cpp	Merge git://anonscm.debian.org/users/gismo/Sankore-3.1 into release-candidate	12 years ago
WBWebTrapWebView.h	*.h: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBWebView.cpp	*.cpp: add 'LGPL-2 with OpenSSL exception' headers	13 years ago
WBWebView.h		Loading commit data...
downloaditem.ui		Loading commit data...
downloads.ui		Loading commit data...
passworddialog.ui		Loading commit data...
proxy.ui		Loading commit data...