overte-JulianGro/interface
ZappoMan 6203e9dc2e Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/Hand.cpp
2013-12-16 12:11:33 -08:00
..
external remove PortAudio entirely 2013-12-03 12:38:26 -08:00
resources removed accidentally added file 2013-11-27 15:48:53 -08:00
src Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 2013-12-16 12:11:33 -08:00
CMakeLists.txt Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 2013-12-16 12:11:33 -08:00
interface.icns update to newer interface icon 2013-05-15 14:43:35 -07:00
InterfaceConfig.h.in Adding build sequence to Interface build 2013-12-16 11:03:49 -06:00
InterfaceVersion.h.in Tidy up 2013-12-16 11:05:08 -06:00