overte-Armored-Dragon/interface
Ryan Huffman 099777ef8c Merge branch 'master' of git://github.com/highfidelity/hifi into 19648
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
2014-05-26 10:01:44 -07:00
..
external Better instructions. 2014-05-12 17:55:07 -07:00
resources Missed a few files. 2014-05-23 16:37:12 -07:00
src Merge branch 'master' of git://github.com/highfidelity/hifi into 19648 2014-05-26 10:01:44 -07:00
ui change node auth URL to data.highfidelity.io 2014-05-22 14:24:19 -07:00
CMakeLists.txt put back ssize_t definition 2014-05-20 11:56:06 -07:00
interface.icns
interface_en.ts Merge branch master 2014-04-24 18:52:59 +05:30
InterfaceConfig.h.in missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00
InterfaceVersion.h.in missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00