Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-thingvellir/domain-server
History
Atlante45 4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
2015-01-28 13:13:32 -08:00
..
resources fix settings url to check domains 2015-01-15 17:44:15 -08:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-28 13:13:32 -08:00
CMakeLists.txt rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00