Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 14:43:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/shared
History
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
..
external move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
src Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-19 11:13:38 -07:00
CMakeLists.txt resolve conflicts on merge with upstream master 2013-08-05 09:56:07 -07:00