4758 commits

Author	SHA1	Message	Date
David Rowe	26e8e22b8b	Move directory, examples, and edit toolbar buttons down ... Moved down as far as they can go within the getRecommendedOverlayRect(), i.e., there's a 50px margin.	2016-04-28 12:23:47 +12:00
David Rowe	9ecffd626e	Capitalize title of directory window from "directory" to "Directory"	2016-04-28 09:01:03 +12:00
Zach Pomerantz	bc8a171fde	Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch	2016-04-27 11:55:24 -07:00
James B. Pollack	6c16e8c6c7	rename default scripts	2016-04-27 00:43:30 -07:00
James B. Pollack	afb2342781	Merge remote-tracking branch 'upstream/master' into defaultScripts	2016-04-26 16:16:56 -07:00
James B. Pollack	cd59c462d1	users and voxel fixes	2016-04-26 15:34:24 -07:00
James B. Pollack	db197b5014	fix users	2016-04-26 14:50:19 -07:00
James B. Pollack	06171f6063	move default to system	2016-04-26 14:47:02 -07:00