ZappoMan d41d86c33c Merge branch 'master' of https://github.com/highfidelity/hifi		2015-07-20 14:31:58 -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	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	Fix https://app.asana.com/0/32622044445063/39927009585710	2015-07-14 13:15:24 -07:00
gpu	Removing superfluous lighting and naked GL in mirror	2015-07-20 09:36:05 -07:00
model	make model depend on octree for ViewFrustum	2015-07-14 17:21:46 -07:00
networking	resolve conflicts on merge with clement/protocol	2015-07-17 16:58:57 -07:00
octree	add back a removed comment from jurisdiction map	2015-07-17 14:00:02 -07:00
physics	cleanup some warnings	2015-07-15 11:20:55 -07:00
render	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-07-20 14:31:58 -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