overte/interface
Andrzej Kapolka 6dbaedd921 Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	interface/src/Application.cpp
2013-08-21 15:46:14 -07:00
..
external updates required for fervor updater with Qt5 2013-08-19 16:05:37 -07:00
resources Fixed glow/ambient occlusion with Oculus. 2013-08-21 15:44:57 -07:00
src Merge branch 'master' of https://github.com/worklist/hifi 2013-08-21 15:46:14 -07:00
CMakeLists.txt remove unneeded package finds in interface CMakeLists 2013-08-20 09:56:50 -07:00
interface.icns update to newer interface icon 2013-05-15 14:43:35 -07:00
InterfaceConfig.h.in