Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate

This commit is contained in:
Howard Stearns 2015-12-10 09:26:28 -08:00
commit e28b901a90

View file

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