James B. Pollack 30c8a44411 Merge remote-tracking branch 'upstream/master' into homereset		2016-04-01 08:02:19 -07:00
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	Update to latest Oculus SDK, add input device support	2016-03-30 10:40:28 -07:00
installer	lots	2016-03-31 09:21:08 -07:00
macros	keep server-console as sandbox folder in Program Files	2016-03-30 13:54:55 -07:00
modules	manually install OpenSSL DLLs for Qt	2016-03-03 17:57:34 -08:00
templates	use HF shortcuts for setup options	2016-03-30 13:56:57 -07:00