samcake 16e6f0900d Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis		2017-04-10 10:12:23 -07:00
..
developer	Trying to improve the Job/Task classes and testing it with the ZoneRenderer	2017-04-09 11:08:35 -07:00
modules	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
system	Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped	2017-04-09 19:00:21 -07:00
tutorials	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
defaultScripts.js	Fix tablet-close behavior for PAL; remove users-tablet.js	2017-03-29 14:53:45 -07:00