ZappoMan 15b5bb4385 Merge branch 'master' of https://github.com/worklist/hifi into flocking_birds ... Conflicts: examples/bot.js		2014-03-05 02:21:40 -08:00
..
resources/web	first cut at flocking birds, change willEmitVisualCallback to update	2014-03-04 14:41:06 -08:00
src	present a login window on app start	2014-02-25 10:53:13 -08:00
CMakeLists.txt	replace deprecated qt5 macros in cmake with target_link_libraries	2014-03-04 12:41:24 -08:00