liranbg 5a287a25ef Merge branch 'Dev' of https://github.com/liranbg/JceManager into Dev ... Conflicts: main/CourseTab/coursestablemanager.cpp		2014-10-08 00:50:02 +03:00
..
coursestablemanager.cpp	Merge branch 'Dev' of https://github.com/liranbg/JceManager into Dev	2014-10-08 00:50:02 +03:00
coursestablemanager.h	gpa contains years and semester	2014-10-05 14:16:01 +03:00