5a287a25ef
Conflicts: main/CourseTab/coursestablemanager.cpp |
||
---|---|---|
.. | ||
CalendarTab | ||
CourseTab | ||
LoginTab | ||
main.cpp | ||
mainscreen.cpp | ||
mainscreen.h | ||
mainscreen.ui |
5a287a25ef
Conflicts: main/CourseTab/coursestablemanager.cpp |
||
---|---|---|
.. | ||
CalendarTab | ||
CourseTab | ||
LoginTab | ||
main.cpp | ||
mainscreen.cpp | ||
mainscreen.h | ||
mainscreen.ui |