Andrzej Kapolka 21fa833f19 Merge branch 'master' of https://github.com/highfidelity/hifi into animate ... Conflicts: interface/src/Application.cpp libraries/shared/src/SharedUtil.cpp libraries/shared/src/SharedUtil.h		2014-04-17 10:58:34 -07:00
..
audio	Merge branch 'master' of https://github.com/worklist/hifi into moonshot	2014-04-15 21:04:15 -07:00
avatars	More work on animation loading.	2014-04-16 20:39:55 -07:00
embedded-webserver	fix header include guards via regex	2014-04-09 12:03:17 -07:00
fbx	More work on animation loading.	2014-04-16 20:39:55 -07:00
metavoxels	make sure gnutls define for ssize_t comes before gnutls include	2014-04-10 10:27:08 -07:00
networking	push packet version to force an update	2014-04-16 13:37:41 -07:00
octree	Merge branch 'master' of https://github.com/worklist/hifi into moonshot	2014-04-15 21:04:15 -07:00
particles	More work on animation loading.	2014-04-14 18:12:32 -07:00
script-engine	More work on animation loading.	2014-04-16 20:39:55 -07:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into animate	2014-04-17 10:58:34 -07:00
voxels	Merge branch 'master' of https://github.com/worklist/hifi into moonshot	2014-04-15 21:04:15 -07:00