Brad Davis f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Menu.cpp interface/src/Menu.h interface/src/avatar/MyAvatar.h tests/ui/src/main.cpp		2015-07-30 12:55:22 -07:00
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	Make OpenVR windows only for now	2015-07-27 09:13:04 -04:00
macros	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-03 06:17:35 -07:00
modules	The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351	2015-07-27 19:04:49 +02:00
templates	rename add paths macro for fixup_bundle	2015-02-23 13:24:21 -08:00