Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 07:31:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/domain-server
History
Atlante45 2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
..
resources fix for row removal in domain array settings 2015-01-06 15:42:01 -08:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
CMakeLists.txt rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00