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/interface
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
..
external Add instructions for building with SDL2 2015-01-11 11:44:16 -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 https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
ui remove more references to voxels 2015-01-07 16:09:56 -08:00
CMakeLists.txt fix to add GLEW debug library 2015-01-07 22:08:01 +01:00
interface.icns
interface_en.ts remove more references to voxels 2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in