Seth Alves 6b2caf8081 Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash		2017-05-02 09:41:47 -07:00
..
components	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
dialogs	Merge pull request #10046 from Triplelexx/21224	2017-04-18 11:10:50 -07:00
models
overlays
tablet	Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash	2017-05-02 09:41:47 -07:00
toolbars	Fix hover states on back/forward buttons	2017-04-14 12:43:07 -07:00
Audio.qml	Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task	2017-04-03 19:33:41 +02:00
Card.qml	cleanup	2017-05-01 15:45:26 -07:00
ComboDialog.qml	Scattered X glyphs around the letterbox and combo dialogs	2017-04-07 11:12:54 -07:00
Desktop.qml	Fix for disappearing toolbar after reload all scripts	2017-03-29 14:10:26 -07:00
Feed.qml	add nextTick, and cleanup	2017-04-28 20:06:13 -07:00
LetterboxMessage.qml	Scattered X glyphs around the letterbox and combo dialogs	2017-04-07 11:12:54 -07:00
NameCard.qml	Quick fix!	2017-04-12 14:57:44 -07:00
Pal.qml	damn linter didn't run - vimrc work ahead...	2017-04-12 10:22:40 -07:00
TabletTextButton.qml	Added hover to Snaps and Places	2017-04-10 17:07:59 +02:00
TextButton.qml	crazy workaround for qt bug	2016-11-16 17:03:24 -08:00