Andrew Meadows b05a315b5a merge upstream/master into andrew/inertia ... Conflicts: interface/src/avatar/MyAvatar.cpp		2014-04-25 14:52:44 -07:00
..
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday	2014-04-21 12:19:19 -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	pass the owner scope to auth requests	2014-04-25 13:22:18 -07:00
octree	Merge pull request #2721 from Atlante45/improved_undo	2014-04-25 14:32:49 -07:00
particles	Remove printf and replace them by qDebug()	2014-04-21 16:17:45 -07:00
script-engine	merge upstream/master into andrew/inertia	2014-04-25 14:52:44 -07:00
shared	merge upstream/master into andrew/inertia	2014-04-25 14:52:44 -07:00
voxels	CR	2014-04-25 13:33:59 -07:00