Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-26 04:57:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-lubosz/libraries
History
Brad Hefta-Gaub 170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
2014-01-15 10:20:21 -08:00
..
audio Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 10:20:21 -08:00
avatars Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 10:20:21 -08:00
metavoxels Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 10:20:21 -08:00
octree Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 10:20:21 -08:00
octree-server Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 10:20:21 -08:00
particle-server removed some debugging 2013-12-12 11:07:13 -08:00
particles Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 10:20:21 -08:00
script-engine initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
shared Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 10:20:21 -08:00
voxel-server initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
voxels Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 10:20:21 -08:00