Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-Armored-Dragon/interface
History
Brad Hefta-Gaub 392ff94ebe Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	interface/src/DataServerClient.cpp
	interface/src/avatar/MyAvatar.cpp
	libraries/avatars/src/AvatarData.h
2014-01-13 15:06:26 -08:00
..
external added latest version of freeglut for windows 2014-01-13 14:46:03 -08:00
resources sytle changes on log dialog 2013-12-29 23:45:24 +01:00
src Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-13 15:06:26 -08:00
CMakeLists.txt Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-13 15:06:26 -08:00
interface.icns
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