src/gui/UBTeacherBarWidget.cpp · 6a109355c0668b3226a2a78500ab624d462b3f2e · lifo / Nicolas Ollinger / OpenBoard · GitLab

Blame History Permalink

Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 6a109355
shibakaneki authored Oct 20, 2011
```
Conflicts:
	src/gui/UBTeacherBarWidget.cpp
	src/gui/UBTeacherBarWidget.h
```
6a109355

UBTeacherBarWidget.cpp 11.3 KB