resources · ab33697595e81aa70abe2c2314777707242b66a0 · lifo / Nicolas Ollinger / OpenBoard · GitLab

History Find file

Merge remote-tracking branch 'remotes/origin/release-1.30' · ab336975

Claudio Valerio authored Oct 26, 2011

Conflicts:
	resources/sankore.qrc
	src/board/UBBoardPaletteManager.cpp
	src/board/UBBoardPaletteManager.h
	src/gui/UBTeacherBarWidget.cpp

ab336975

Name	Last commit	Last update
..
etc		Loading commit data...
fonts		Loading commit data...
forms		Loading commit data...
i18n		Loading commit data...
images		Loading commit data...
library		Loading commit data...
linux		Loading commit data...
macx		Loading commit data...
podcast		Loading commit data...
style		Loading commit data...
webbrowser		Loading commit data...
win		Loading commit data...
www		Loading commit data...
sankore.qrc		Loading commit data...
style.qss		Loading commit data...