overte/interface
Andrzej Kapolka 95e59d7004 Merge branch 'master' of https://github.com/highfidelity/hifi
Conflicts:
	interface/interface_en.ts
	interface/src/Menu.h
2014-03-13 16:56:06 -07:00
..
external Slight tweak to Visage instructions (in order not to overwrite our custom 2014-03-10 15:16:48 -07:00
resources Changed the chat window to a popup with a custom closing button. 2014-03-13 04:07:33 +02:00
src Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-13 16:56:06 -07:00
ui Moved the chat from a window to a built-in panel. 2014-03-14 01:12:25 +02:00
CMakeLists.txt Fixes for Linux build. 2014-03-13 10:56:19 -07:00
interface.icns
InterfaceConfig.h.in
InterfaceVersion.h.in Checkpoint 2014-01-13 07:37:47 -06:00