Commit graph

9 commits

Author SHA1 Message Date
Atlante45
e9b7125894 Misc cleanup 2015-10-06 13:56:26 -07:00
MarcelEdward
64a8f7ebb4 Update 3DConnexionClient.h 2015-09-15 00:30:11 +02:00
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
Bradley Austin Davis
53ccbfc4fa Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
Sam Gondelman
95232920f1 trying to fix mac linking errors 2015-08-03 16:35:34 -07:00
Sam Gondelman
01c4e17236 trying to fix connexion linker errors, general style fixes, renamed some files 2015-08-01 11:41:29 -07:00
SamGondelman
8908c7c141 working on windows crash 2015-07-31 17:55:59 -07:00
SamGondelman
25e75bcc79 WIP: trying to fix windows not finding framework 2015-07-30 18:11:24 -07:00
Sam Gondelman
b19376ef6e trying to fix connexion linker errors, general style fixes, renamed some files 2015-07-30 12:17:36 -07:00
Renamed from interface/src/devices/3Dconnexion.h (Browse further)