Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-19 23:28:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-JulianGro/interface
History
Atlante45 4a1687c023 Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
2014-04-02 18:16:30 -07:00
..
external slightly different approach to windows warning fix 2014-03-15 21:30:45 -07:00
resources Manual merge 2014-04-02 18:07:55 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD 2014-04-02 18:16:30 -07:00
ui Manual merge 2014-04-02 18:07:55 -07:00
CMakeLists.txt more cleanup 2014-03-22 20:42:34 -07:00
interface.icns
interface_en.ts Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD 2014-04-02 18:16:30 -07:00
InterfaceConfig.h.in
InterfaceVersion.h.in