Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready

This commit is contained in:
Seth Alves 2015-12-10 09:24:39 -08:00
commit 1cb4debfb0

View file

@ -3,3 +3,6 @@ setup_hifi_library()
link_hifi_libraries(shared plugins controllers)
GroupSources("src/input-plugins")
target_sdl2()
target_sixense()