Brad Davis 6a5c7b8b42 Merge remote-tracking branch 'upstream/master' into plugins_pt2 ... Conflicts: libraries/script-engine/src/MenuItemProperties.cpp		2015-05-11 12:40:17 -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 plugins_pt2	2015-05-11 12:40:17 -07:00
ui	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-04-14 13:13:15 -07:00
CMakeLists.txt	Rebasing onto scale changes	2015-05-08 15:09:46 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in