Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 01:59:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface
History
Bradley Austin Davis 7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
..
external trying to fix connexion linker errors, general style fixes, renamed some files 2015-08-01 11:41:29 -07:00
icon
resources Merge branch 'master' into plugins 2015-08-06 11:03:37 -07:00
src Merge branch 'master' into plugins 2015-08-06 11:03:37 -07:00
ui Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
CMakeLists.txt Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
interface_en.ts
InterfaceVersion.h.in