overte-HifiExperiments/interface
Andrzej Kapolka e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected
Conflicts:
	interface/src/Avatar.cpp
2013-07-03 10:15:11 -07:00
..
external Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-01 09:49:01 -07:00
resources add fervor updater and run during launch if OS X release 2013-06-26 10:36:32 -07:00
src Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-03 10:15:11 -07:00
CMakeLists.txt Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-03 10:15:11 -07:00
interface.icns update to newer interface icon 2013-05-15 14:43:35 -07:00
InterfaceConfig.h.in