https://github.com/samtuhka/pupil
Revision dde9edcf508e0ea83f7eb5c887f7733271883398 authored by Moritz Kassner on 11 February 2014, 22:59:27 UTC, committed by Moritz Kassner on 11 February 2014, 22:59:27 UTC
Conflicts: pupil_src/shared_modules/plugin.py
Tip revision: dde9edcf508e0ea83f7eb5c887f7733271883398 authored by Moritz Kassner on 11 February 2014, 22:59:27 UTC
Merge branch 'pupil_player'
Merge branch 'pupil_player'
Tip revision: dde9edc
File | Mode | Size |
---|---|---|
deploy_capture | ||
deploy_player | ||
license | ||
pupil_src | ||
.gitignore | -rw-r--r-- | 310 bytes |
README.md | -rw-r--r-- | 2.7 KB |
run_capture | -rwxr-xr-x | 110 bytes |
update | -rwxr-xr-x | 1.2 KB |
Computing file changes ...