samcake 79bcf95792 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis		2017-04-11 10:00:34 -07:00
..
developer	REfining the Config behavior, trying to pr next	2017-04-10 19:01:49 -07:00
modules	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
system	fix crashes when clicking in the homebutton	2017-04-11 00:25:08 +01: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