overte-HifiExperiments/interface
barnold1953 5665e4d278 Merge branch 'master' of https://github.com/highfidelity/hifi
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
2014-05-27 16:16:27 -07:00
..
external Better instructions. 2014-05-12 17:55:07 -07:00
resources What the heck; let's try using some multisampling on the shadow maps. 2014-05-27 12:30:45 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 16:16:27 -07:00
ui Fix chat scroll bar widget jumping 2014-05-25 16:41:01 -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