Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-06 19:18:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6314 commits 25 branches 0 tags 1.1 GiB
Commit graph

4 commits

Author SHA1 Message Date
ZappoMan
2be85d439b Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	interface/src/Application.cpp
	interface/src/VoxelPacketProcessor.cpp
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2013-08-19 11:13:38 -07:00
ZappoMan
82782b6ec5 switched to using Application singleton 2013-08-15 13:10:41 -07:00
Stephen Birarda
d257b70103 fixes for new Menu class after merge with upstream/master 2013-08-15 12:29:04 -07:00
ZappoMan
beec5f60d8 renamed class to be more appropriate, added doxygen comments 2013-08-15 08:36:06 -07:00
Renamed from interface/src/VoxelPacketReceiver.cpp (Browse further)