Ryan Huffman dd9dea7a97 Merge remote-tracking branch 'birarda/protocol' into receive_packets ... Conflicts: interface/src/DatagramProcessor.cpp interface/src/octree/OctreePacketProcessor.cpp libraries/entities/src/EntityEditPacketSender.cpp libraries/networking/src/LimitedNodeList.h libraries/networking/src/NLPacket.h		2015-07-09 14:08:35 -07:00
..
animation
audio	pass const NLPacket& for all sendUnreliablePacket calls	2015-07-09 11:42:18 -07:00
audio-client	Merge remote-tracking branch 'birarda/protocol' into receive_packets	2015-07-09 14:08:35 -07:00
auto-updater
avatars	Merge remote-tracking branch 'birarda/protocol' into receive_packets	2015-07-09 14:08:35 -07:00
embedded-webserver
entities	Merge remote-tracking branch 'birarda/protocol' into receive_packets	2015-07-09 14:08:35 -07:00
entities-renderer	resolve conflicts on merge with upstream/master	2015-07-08 22:54:36 -07:00
environment
fbx
gpu	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-08 14:25:41 -07:00
model
networking	Merge remote-tracking branch 'birarda/protocol' into receive_packets	2015-07-09 14:08:35 -07:00
octree	fix for arguments that are now const NLPacket&	2015-07-09 11:32:00 -07:00
physics	Merge pull request #3 from birarda/atp	2015-07-09 16:51:37 -04:00
render	Adding intrsumentation for nsight and hiding the nsight specific code in cpp	2015-07-08 14:25:13 -07:00
render-utils	Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix	2015-07-09 08:38:55 -07:00
script-engine	Merge pull request #3 from birarda/atp	2015-07-09 16:51:37 -04:00
shared	Merge pull request #3 from birarda/atp	2015-07-09 16:51:37 -04:00
ui