timetable updated
Merge dev into dev-YangWei
timetable updated (print)
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
timetable updated (print)
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
timetable updated for multiple attributes
timetable updated (phase 2)
timetable updated (phase 2)
Modified setScheduleResults parameters. Ad-hoc schedule not tested yet.
Retry algorithm v1
Retry algorithm v2
Merge pull request #80 from mehere/dev-wee

Scheduling Algo to increase recommendedNoOfLesson if failed.
timetable updated (phase 2)
resolve conflicts
timetable update (phase 2)
timetable update (phase 2)
Merge dev_xue into dev
Merge pull request #81 from mehere/dev

Pull Request from dev -> dev-wee on 3/3
adhoc resolve