Commit graph

5 commits

Author SHA1 Message Date
tosh
1e6352593a Merge branch 'master' of git://github.com/worklist/hifi into 19262
Conflicts:
	interface/src/Head.cpp
	interface/src/Util.cpp
	interface/src/main.cpp
	libraries/avatars/src/Orientation.cpp
2013-04-18 12:38:35 +02:00
stojce
7bda2c0581 #19069 Add iris textures to avatar head, change lighting 2013-02-27 01:53:07 +01:00
Stephen Birarda
13a0597ab6 dynamic header for GLUT include 2013-02-08 12:17:35 -08:00
Stephen Birarda
f5cbe7a05a cmake build working for interface project 2013-02-07 17:29:01 -08:00
Stephen Birarda
1111e4837e intial restructuring for CMake setup 2013-02-06 18:07:36 -08:00
Renamed from Source/Texture.cpp (Browse further)