281e56be3c
Conflicts: main/CourseTab/coursestablemanager.cpp |
||
---|---|---|
.. | ||
CalendarTab | ||
CourseTab | ||
LoginTab | ||
main.cpp | ||
mainscreen.cpp | ||
mainscreen.h | ||
mainscreen.ui |
281e56be3c
Conflicts: main/CourseTab/coursestablemanager.cpp |
||
---|---|---|
.. | ||
CalendarTab | ||
CourseTab | ||
LoginTab | ||
main.cpp | ||
mainscreen.cpp | ||
mainscreen.h | ||
mainscreen.ui |