Andrzej Kapolka e3074d726b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels ... Conflicts: libraries/metavoxels/src/Spanner.cpp		2015-01-09 11:52:05 -08:00
..
audio	Fix miscellaneous types and casts	2015-01-08 13:44:51 -08:00
avatars	Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo	2014-12-17 09:23:42 -08:00
entities	resolve conflicts on merge with upstream master	2014-12-15 09:36:17 -08:00
metavoxels	Removed unused functions, stubbing out "stack" layer.	2014-12-05 17:46:28 -08:00
octree	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
Agent.cpp	Merge pull request #4072 from Atlante45/network_replies_cleanup	2015-01-09 07:42:36 -08:00
Agent.h	first major pass at voxelEctomy	2014-12-30 18:08:58 -08:00
AssignmentClient.cpp	have ShutdownEventListener handle WM_CLOSE or SIGTERM	2014-12-11 10:21:11 -08:00
AssignmentClient.h	have ShutdownEventListener handle WM_CLOSE or SIGTERM	2014-12-11 10:21:11 -08:00
AssignmentClientMonitor.cpp	have ShutdownEventListener handle WM_CLOSE or SIGTERM	2014-12-11 10:21:11 -08:00
AssignmentClientMonitor.h	have ShutdownEventListener handle WM_CLOSE or SIGTERM	2014-12-11 10:21:11 -08:00
AssignmentFactory.cpp	first major pass at voxelEctomy	2014-12-30 18:08:58 -08:00
AssignmentFactory.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
AssignmentThread.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
AssignmentThread.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
main.cpp	move Logging to LogHandler	2014-10-28 13:59:23 -07:00