add emp and room, now is working!!! YEAH lol
add emp and room, now is working!!! YEAH lol
Merge pull request #19 from Brianified/master

added stuff to meeting modyify
Merge pull request #20 from Brianified/master

added changes
Minor bugfix.
Fixed a bug when calculate the shift_hour.
Merge pull request #21 from Brianified/master

cancel meeting updates correctly
6:36 AM
Merge remote-tracking branch 'Master/master'

Conflicts:
	MeetingScheduler/src/scheduler/gui/SchedulerPanel.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	MeetingScheduler/src/scheduler/controller/Controller.java
	MeetingScheduler/src/scheduler/gui/AdministratorPanel.java
	MeetingScheduler/src/scheduler/gui/DelEmpDialog.java
	MeetingScheduler/src/scheduler/gui/DelRoomDialog.java
	MeetingScheduler/src/scheduler/gui/RoomDialog.java
	MeetingScheduler/src/scheduler/gui/SchedulerPanel.java
Merge pull request #22 from shanyiming/master

6:50AM
Updated meeting_scheduler.sql
update meeting and delete meeting established