overte/interface/resources
tosh 2341af271b Merge branch 'master' of git://github.com/worklist/hifi into 19188
Conflicts:
	interface/CMakeLists.txt
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
	shared/src/VoxelTree.cpp
2013-04-03 22:44:22 +02:00
..
audio add a new walk sound 2013-03-22 14:06:20 -07:00
images added eye texture 2013-03-06 07:20:11 +01:00
gen_stars.py adjusts the north-south meridian 2013-03-27 17:12:33 +01:00
stars.txt adjusts the north-south meridian 2013-03-27 17:12:33 +01:00