weather/mailbox
CAN Bus Code
- project settings (Jinsuk)
ignore
Merge branch 'master' of https://github.com/jackyktlau/gcu_code.git

Conflicts:
	.gitignore
	ActiveMQThread/.cproject
	ActiveMQThread/.project
	GCU/.cproject
	GCU/.project
	GCUPLCThread/.cproject
	GCUPLCThread/.project
	GCU_Program/.cproject
	GCU_Program/.project
	SMCMessageCtrl/.cproject
	SMCMessageCtrl/.project
	mailbox/.cproject
	mailbox/.project
	powermgmt/.cproject
	powermgmt/.project
	weatherstation/.cproject
	weatherstation/.project
- progress
Merge branch 'master' of https://github.com/jackyktlau/gcu_code.git
- project settings Jin
Merge branch 'master' of https://github.com/jackyktlau/gcu_code.git

Conflicts:
	GCU_Program/.cproject
After 3 hours....