Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-30 21:13:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/interface
History
Ryan Huffman 5ece424a45 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/ui/runningScriptsWidget.ui
2014-06-24 20:27:44 -07:00
..
external
resources Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-17 20:27:16 -07:00
src Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-24 20:27:44 -07:00
ui Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-24 20:27:44 -07:00
CMakeLists.txt
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in