16 commits

Author	SHA1	Message	Date
Atlante45	775994f9d0	Fix for 3DConnection	2015-10-06 13:57:49 -07:00
Brad Hefta-Gaub	2eaeb26b2a	fix GetVersionEx warning	2015-09-24 09:14:51 -07:00
Brad Hefta-Gaub	e99ad75a28	more warnings fixes	2015-09-22 18:01:39 -07:00
Brad Davis	b7237fb5ca	Fixing build problem with 3d connexion	2015-08-23 09:32:58 -07:00
Sam Gondelman	4c7c2e9390	fixing more connexion problems	2015-08-06 15:06:05 -07: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	0edd7fd3c4	Merge fix	2015-08-04 00:32:38 -07:00
Sam Gondelman	95232920f1	trying to fix mac linking errors	2015-08-03 16:35:34 -07:00
Sam Gondelman	647bb2b9ce	removing unnecessary weak link	2015-08-01 11:41:29 -07:00
Sam Gondelman	8d77afaa94	more work on cleaning up connexion	2015-08-01 11:41:29 -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	a01a4f929f	removing unnecessary weak link	2015-07-30 15:14:51 -07:00
Sam Gondelman	b8f7d4b8c8	more work on cleaning up connexion	2015-07-30 13:19:05 -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.cpp (Browse further)