4 commits

Author	SHA1	Message	Date
Huy Pham	f6c02973c1	fix merge conflict	2019-12-19 11:12:45 -08:00
Huy Pham	5a81adc653	some fix one paint tool	2019-12-19 10:58:22 -08:00
Blake Harnden	05d3b58c5f	updating dialog based classes to have dialog in name	2019-12-19 09:50:58 -08:00
Blake Harnden	0b5c94778c	moved coretk under daemon/core/gui	2019-12-19 09:30:21 -08:00