Cain Kilgore f91a8c0f53 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler		2017-07-13 21:25:39 +01:00
..
preferences	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
TabletFileDialog.qml	Make background with default color. Fix few warnings	2017-06-22 16:47:40 +02:00
TabletPreferencesDialog.qml	fixed merge conflicts	2017-05-27 00:57:09 +01:00