overte-HifiExperiments/interface
Ryan Huffman 5ef9e3b3c0 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
Conflicts:
	interface/src/Application.cpp
2014-06-11 14:34:59 -07:00
..
external Better instructions. 2014-05-12 17:55:07 -07:00
resources Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-11 13:30:47 -07:00
src Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-11 14:34:59 -07:00
ui Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-11 13:30:47 -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