Atlante45 dce1fc6855 SendQueue first draft		2015-07-23 11:18:52 -07:00
..
animation	CR	2015-07-14 15:16:00 -07:00
audio	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
audio-client	kill the PacketLister (AKA Huffman 1 : PacketListener 0)	2015-07-17 09:07:39 -07:00
auto-updater	Don't display update dialog if this is a PR build	2015-07-02 14:17:36 -06:00
avatars	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
gpu	Fixing merge	2015-07-22 11:31:46 -07:00
model	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
networking	SendQueue first draft	2015-07-23 11:18:52 -07:00
octree	add back a removed comment from jurisdiction map	2015-07-17 14:00:02 -07:00
physics	fix crash for convex hull of co-planar points	2015-07-22 15:06:10 -07:00
render	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
render-utils	Fixing merge	2015-07-22 11:31:46 -07:00
script-engine	fixes in edit.js UI	2015-07-21 13:15:24 -07:00
shared	Preparing for first pr	2015-07-22 10:43:50 -07:00
ui	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00