NeetBhagat ead0d42cf3 Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h		2017-06-07 15:47:19 +05:30
..
developer	Merge branch 'master' into 21369	2017-06-07 15:47:19 +05:30
modules	request module updates	2017-05-03 07:32:23 -07:00
system	Merge pull request #10613 from hyperlogic/bugfix/teleport-with-no-feet	2017-06-06 09:33:00 -07:00
tutorials	use 'tractor' instead of 'spring' in JS files	2017-05-16 08:35:54 -07:00
defaultScripts.js	Fix tablet-close behavior for PAL; remove users-tablet.js	2017-03-29 14:53:45 -07:00