liranbg 910372a363 Merge remote-tracking branch 'origin/Staging' into Dev ... Conflicts: main/CourseTab/coursestablemanager.cpp		2014-10-16 10:28:59 +03:00
..
CalendarTab	headers fix	2014-10-15 11:55:12 +03:00
CourseTab	Merge remote-tracking branch 'origin/Staging' into Dev	2014-10-16 10:28:59 +03:00
jceWidgets	new connection icons! :)	2014-10-14 06:47:15 +03:00
LoginTab	headers fix	2014-10-15 11:55:12 +03:00
main.cpp	dockwidget instead of menu	2014-10-14 02:45:11 +03:00
mainscreen.cpp	unlock bug fix	2014-10-14 18:01:45 +03:00
mainscreen.h	dockwidget instead of menu	2014-10-14 02:45:11 +03:00
mainscreen.ui	Merge remote-tracking branch 'origin/Staging' into Dev	2014-10-16 10:28:59 +03:00