8 commits

Author	SHA1	Message	Date
vladest	fe5d7463fe	Merge branch 'master' into move_to_qqc2	2018-03-10 14:42:51 +01:00
Zach Fox	d0cc64f63d	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
vladest	148faa3a93	Merge branch 'master' into move_to_qqc2	2018-03-04 14:16:21 +01:00
Zach Fox	67034274fa	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
vladest	0c13c2b6e2	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
Brad Davis	0b1df891af	Backporting visual work from branch	2015-04-27 10:53:58 -07:00
Brad Davis	1ff8c67576	More work on menus and some code cleanup	2015-04-24 12:54:11 -07:00
Brad Davis	d68d13489d	Working on appearance of menus	2015-04-23 21:55:31 -07:00