Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-01 22:40:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/assignment-client
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
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-28 13:13:32 -08:00
CMakeLists.txt more voxelEctomy 2014-12-30 19:58:04 -08:00