Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 22:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/interface
History
Andrew Meadows 02c58447df merge upstream/master into "shapes" project 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	libraries/avatars/src/HandData.h
	libraries/shared/src/SharedUtil.h
2014-03-18 12:41:20 -07:00
..
external slightly different approach to windows warning fix 2014-03-15 21:30:45 -07:00
resources Changed the chat window to a popup with a custom closing button. 2014-03-13 04:07:33 +02:00
src merge upstream/master into "shapes" project 2014-03-18 12:41:20 -07:00
ui Moved the chat from a window to a built-in panel. 2014-03-14 01:12:25 +02:00
CMakeLists.txt Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-14 01:52:53 +01:00
interface.icns
interface_en.ts Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-15 19:46:26 +01:00
InterfaceConfig.h.in Adding build sequence to Interface build 2013-12-16 11:03:49 -06:00
InterfaceVersion.h.in Checkpoint 2014-01-13 07:37:47 -06:00