Brad Davis a12bfd95f4 Merge remote-tracking branch 'upstream/master' into ui-refactor ... Conflicts: libraries/render-utils/src/MatrixStack.h		2015-04-27 10:59:57 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	Cleaning up unused stuff	2015-04-24 16:44:48 -07:00
src	Merge remote-tracking branch 'upstream/master' into ui-refactor	2015-04-27 10:59:57 -07:00
ui	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-04-14 13:13:15 -07:00
CMakeLists.txt	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in