Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 01:20:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
Brad Davis 8c4f802dbf Merge remote-tracking branch 'upstream/master' into web-entity 
Conflicts:
	libraries/entities/src/EntityItemProperties.h
	libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -07:00
..
external remove visage related files 2015-04-17 13:40:31 -07:00
icon
resources Merge pull request #4701 from jherico/infoview 2015-05-06 12:12:21 -07:00
src Merge remote-tracking branch 'upstream/master' into web-entity 2015-05-12 15:56:02 -07:00
ui Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-04-14 13:13:15 -07:00
CMakeLists.txt add a macro to recursively correctly handle resources 2015-04-27 16:02:52 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in