Niraj Venkat e0634de403 Turn on/off debug AO from menu item		2015-07-21 12:14:09 -07:00
..
animation
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
avatars	seek to correct place for bulk avatar data	2015-07-17 15:57:52 -07:00
embedded-webserver
entities	resolve conflicts on merge with upstream master	2015-07-17 16:48:46 -07:00
entities-renderer	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx
gpu	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-20 14:55:27 -07:00
model
networking	bump packet versions after fix	2015-07-20 15:20:14 -07:00
octree	add back a removed comment from jurisdiction map	2015-07-17 14:00:02 -07:00
physics
render	Turn on/off debug AO from menu item	2015-07-21 12:14:09 -07:00
render-utils	Turn on/off debug AO from menu item	2015-07-21 12:14:09 -07:00
script-engine	quit the ScriptEngine thread once the script is done	2015-07-17 11:18:14 -07:00
shared	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
ui	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00