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
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	Merge branch 'master' into plugins	2015-08-06 11:03:37 -07:00
macros	Merge branch 'core' into plugins	2015-08-03 22:25:50 -07:00
modules	resolve conflicts on merge with upstream/core	2015-08-05 14:37:30 -07:00
templates	rename add paths macro for fixup_bundle	2015-02-23 13:24:21 -08:00