overte-HifiExperiments/interface
ZappoMan 23c6a9017c Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
2013-03-25 22:51:59 -07:00
..
cmake/modules move interface externals to its directory 2013-02-14 15:26:05 -08:00
external more windows port 2013-03-20 12:13:14 -07:00
resources add a new walk sound 2013-03-22 14:06:20 -07:00
src Merge branch 'master' of https://github.com/worklist/hifi 2013-03-25 22:51:59 -07:00
CMakeLists.txt add method to SharedUtil to chdir to OS X bundle resources 2013-03-22 10:35:55 -07:00
Interface.icns include the icon file referenced in last commit 2013-02-15 13:01:00 -08:00
InterfaceConfig.h.in add header for glut to conditional include in InterfaceConfig 2013-02-08 14:57:59 -08:00