Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 10:03:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface
History
Ryan Huffman a07d92b6ea Merge branch 'master' of github.com:highfidelity/hifi into audio-buffer-starvation-detection 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Audio.h
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
2015-01-07 09:46:07 -08:00
..
external Script updates and fixes to highfidelity-public 2015-01-06 17:04:42 -08:00
resources Merge pull request #4027 from huffman/grid-shader-updates 2015-01-05 13:00:05 -08:00
src Merge branch 'master' of github.com:highfidelity/hifi into audio-buffer-starvation-detection 2015-01-07 09:46:07 -08:00
ui Merge branch 'master' of github.com:highfidelity/hifi into audio-buffer-starvation-detection 2015-01-07 09:46:07 -08:00
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in