Philip Rosedale 0d7644d1fc Merge branch 'master' of https://github.com/worklist/hifi		2013-05-20 19:01:01 -07:00
..
audio	use AgentList defaults when AIM has no socket or address set	2013-05-20 11:48:50 -07:00
avatars	lazy allocation of HeadData in getBroadcastData	2013-05-20 17:31:33 -07:00
shared	Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter	2013-05-20 19:00:49 -07:00
voxels	Tabs -> spaces, spacing fix.	2013-05-20 09:38:01 -07:00