Zach Fox 1b74576259 Fix tablet-close behavior for PAL; remove users-tablet.js		2017-03-29 14:53:45 -07:00
..
animation	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
audio
audio-client	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
auto-updater
avatars	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
controllers
display-plugins	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
embedded-webserver
entities	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
entities-renderer	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
fbx	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
gl	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
gpu	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
gpu-gl	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
input-plugins	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
ktx	Revert "Don't hold KTX files open for longer than transfers require"	2017-03-28 14:06:09 -07:00
model	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
model-networking	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
octree	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
physics	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
plugins
procedural
recording	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
render	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
render-utils	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
script-engine	Fix tablet-close behavior for PAL; remove users-tablet.js	2017-03-29 14:53:45 -07:00
shared	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
ui	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
ui-plugins