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/tests
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
..
audio rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
jitter rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
metavoxels Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2014-12-22 13:34:18 -08:00
networking rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
octree Code review 2015-01-08 18:20:23 -08:00
physics easier to read Bullet to GLM conversions and back 2014-12-30 13:15:57 -08:00
shared rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
CMakeLists.txt the command: 2014-09-03 16:34:23 +02:00