Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-02 04:01:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface
History
samcake abacefa723 Merge remote-tracking branch 'upstream/master' into 19734 
Conflicts:
	interface/CMakeLists.txt
	interface/src/avatar/SkeletonModel.cpp
2014-07-05 19:25:46 -07:00
..
external Merge remote-tracking branch 'upstream/master' into 19734 2014-07-05 19:25:46 -07:00
resources Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-02 13:12:37 -07:00
src Merge remote-tracking branch 'upstream/master' into 19734 2014-07-05 19:25:46 -07:00
ui Merge pull request #3108 from huffman/19800 2014-07-02 15:46:56 -07:00
CMakeLists.txt Merge remote-tracking branch 'upstream/master' into 19734 2014-07-05 19:25:46 -07:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in