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
Brad Hefta-Gaub 1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 
Conflicts:
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
2016-10-20 09:38:03 -07:00
..
external
i18n
icon lots 2016-03-31 09:21:08 -07:00
resources Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-20 09:38:03 -07:00
src Merge pull request #8856 from jherico/geometry_ids 2016-10-20 08:14:49 -07:00
ui Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
CMakeLists.txt add custom QWebEngine request interceptor 2016-10-17 11:34:10 -07:00
interface.exe.manifest Add Windows manifest to interface.exe 2016-03-31 14:20:19 -07:00