6 Commits

Author	SHA1	Message	Date
ori	ce94cea27b	Merge branch 'master' into dev	2019-05-01 12:10:46 -07:00
ori	6c2a2926af	new branch and error	2019-05-01 10:37:52 -07:00
ori	93a22ffe9f	intagrated setting manager into socket handler and camera handler	2019-05-01 10:16:40 -07:00
ori	d073f6fcd2	working camera process ... it need more work with integration	2019-04-29 14:15:53 -07:00
ori	53716dd2dc	Added shit	2019-04-20 09:02:21 -07:00
ori	8118bb29a7	finished settings manager and socket handler	2019-04-20 06:53:06 -07:00