src/tools · 2539522f77384fca1c11a4fe704dbf931c9a20b3 · lifo / Nicolas Ollinger / OpenBoard

Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 2539522f

shibakaneki authored Aug 29, 2011

Conflicts:
	resources/sankore.qrc
	src/adaptors/UBSvgSubsetAdaptor.cpp
	src/adaptors/UBSvgSubsetAdaptor.h
	src/gui/UBDockPalette.cpp
	src/gui/UBDockPalette.h
	src/gui/UBLibPalette.cpp
	src/gui/UBNavigatorPalette.cpp

2539522f

Name	Last commit	Last update
..
UBAbstractDrawRuler.cpp		Loading commit data...
UBAbstractDrawRuler.h		Loading commit data...
UBGraphicsCache.cpp		Loading commit data...
UBGraphicsCache.h		Loading commit data...
UBGraphicsCompass.cpp		Loading commit data...
UBGraphicsCompass.h		Loading commit data...
UBGraphicsCurtainItem.cpp		Loading commit data...
UBGraphicsCurtainItem.h		Loading commit data...
UBGraphicsCurtainItemDelegate.cpp		Loading commit data...
UBGraphicsCurtainItemDelegate.h		Loading commit data...
UBGraphicsProtractor.cpp		Loading commit data...
UBGraphicsProtractor.h		Loading commit data...
UBGraphicsRuler.cpp		Loading commit data...
UBGraphicsRuler.h		Loading commit data...
UBGraphicsTriangle.cpp		Loading commit data...
UBGraphicsTriangle.h		Loading commit data...
UBToolsManager.cpp		Loading commit data...
UBToolsManager.h		Loading commit data...
tools.pri		Loading commit data...