Skip to content
GitLab
Explore
Sign in
kumir
kumir2
Repository
kumir2
src
plugins
coursemanager
coursemanager_plugin.cpp
Find file
Blame
History
Permalink
Merge branches 'master' and 'master' of gitorious.org:kumir2/kumir2
· bf7b829d
Denis Khachko
authored
May 22, 2013
Conflicts: src/plugins/coursemanager/task/mainwindow.cpp
bf7b829d