Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-03 23:03:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface
History
Atlante45 43597ea29d Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
2015-01-19 14:18:22 -08:00
..
external Merge branch 'master' of https://github.com/highfidelity/hifi into 20216 2015-01-15 02:28:31 +01:00
resources Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-08 14:57:03 -08:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-19 14:18:22 -08:00
ui changed "Load Scripts" label to be better understandable 2015-01-13 01:09:28 +01:00
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into 20216 2015-01-15 02:28:31 +01:00
interface.icns update the interface icon 2014-07-07 11:46:57 -07:00
interface_en.ts remove more references to voxels 2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in