8 commits

Author	SHA1	Message	Date
HifiExperiments	2667af3682	more safeguards	2021-01-20 21:25:30 -08:00
Gabriel Calero	069d3e40bc	Merge branch 'android' into android_bubble_fix	2018-03-06 18:58:49 -03:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Brad Davis	97593bc4d8	Fixing compiled resource access	2018-01-10 17:18:12 -08:00
Brad Davis	b1e95681a9	Cleanup android	2018-01-09 23:30:31 -08:00
Gabriel Calero	d31346c047	Use qml engine	2018-01-03 16:40:14 -03:00
Ryan Huffman	5b58e8ae97	Fix ConnectionHandler not handling connected-but-need-auth condition	2016-10-24 10:44:33 -07:00
Brad Davis	d68618e206	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00