Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 15:32:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface
History
stojce 8dc6ca75a4 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
	interface/resources/resources.qrc
	interface/src/Menu.cpp
2014-04-04 21:16:29 +02:00
..
external slightly different approach to windows warning fix 2014-03-15 21:30:45 -07:00
resources Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-04 21:16:29 +02:00
src Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-04 21:16:29 +02:00
ui Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-04 21:16:29 +02:00
CMakeLists.txt Don't refer to the QM file. 2014-04-03 11:42:43 -07:00
interface.icns
interface_en.ts Remove translations for now, but use correct translation keys for the only 2014-04-03 11:30:06 -07:00
InterfaceConfig.h.in
InterfaceVersion.h.in