Andrzej Kapolka c471a55f1f Merge branch 'master' of https://github.com/highfidelity/hifi		2014-04-23 09:40:51 -07:00
..
audio	fix property in sound	2014-04-18 14:48:26 -07:00
avatars	add property for display name to JS	2014-04-18 14:24:50 -07:00
embedded-webserver	fix header include guards via regex	2014-04-09 12:03:17 -07:00
fbx	merge upstream/master into andrew/inertia	2014-04-18 11:30:26 -07:00
metavoxels	make sure gnutls define for ssize_t comes before gnutls include	2014-04-10 10:27:08 -07:00
networking	Merge pull request #2709 from ZappoMan/shared_and_weak_pointers	2014-04-22 10:28:39 -07:00
octree	Merge pull request #2709 from ZappoMan/shared_and_weak_pointers	2014-04-22 10:28:39 -07:00
particles	Remove printf and replace them by qDebug()	2014-04-21 16:17:45 -07:00
script-engine	Style	2014-04-21 21:44:50 +02:00
shared	Experimenting with tweaking the Euler angles so that z, rather than y, is in	2014-04-18 17:16:20 -07:00
voxels	Added getter for tree scale in js	2014-04-18 16:00:44 -07:00