Brad Davis c6bc6f6ef2 Merge remote-tracking branch 'upstream/master' into android_nov		2017-12-16 16:20:16 -08:00
..
src/display-plugins	fix reticle depth at different scales and x button click on mouse press	2017-11-27 17:46:19 -08:00
CMakeLists.txt	Fix polyvox archive, correct build errors, add additional libraries	2017-12-12 18:29:36 -08:00