src/desktop/UBDesktopAnnotationController.cpp · 8238b22e55711ef9acd53ebc9e8ba231acb5ae20 · lifo / Nicolas Ollinger / OpenBoard · GitLab

Blame History Permalink

Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 20a787f1
Claudio Valerio authored Apr 10, 2012
```
Conflicts:
	src/board/UBBoardView.cpp
	src/domain/UBGraphicsItemDelegate.cpp
```
20a787f1

UBDesktopAnnotationController.cpp 31.7 KB