Ryan Huffman 44c99ef89a Replace bytesAvailable with bytesLefToRead		2015-07-15 10:44:51 -07:00
..
animation
audio	Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol	2015-07-14 16:36:28 -07:00
audio-client	Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp	2015-07-14 17:16:42 -07:00
auto-updater
avatars	Replace bytesAvailable with bytesLefToRead	2015-07-15 10:44:51 -07:00
embedded-webserver
entities	Replace bytesAvailable with bytesLefToRead	2015-07-15 10:44:51 -07:00
entities-renderer	Merge branch 'protocol' of github.com:birarda/hifi into receive_packets	2015-07-14 10:21:31 -07:00
environment
fbx
gpu
model	make model depend on octree for ViewFrustum	2015-07-14 17:21:46 -07:00
networking	Replace bytesAvailable with bytesLefToRead	2015-07-15 10:44:51 -07:00
octree	Replace bytesAvailable with bytesLefToRead	2015-07-15 10:44:51 -07:00
physics	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
render
render-utils	Replace bytesAvailable with bytesLefToRead	2015-07-15 10:44:51 -07:00
script-engine	Merge branch 'protocol' of https://github.com/birarda/hifi into protocol	2015-07-14 14:11:41 -07:00
shared	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
ui