https://github.com/pupil-labs/pupil
Revision 8ce6a9dc971ec699b3986f12c01e2b22d52cc0c8 authored by Pablo Prietz on 20 January 2017, 10:47:18 UTC, committed by Pablo Prietz on 20 January 2017, 10:47:18 UTC
# Conflicts:
#	pupil_src/capture/world.py
2 parent s 56bbf50 + 785159a
History
Tip revision: 8ce6a9dc971ec699b3986f12c01e2b22d52cc0c8 authored by Pablo Prietz on 20 January 2017, 10:47:18 UTC
Merge branch 'master' into blink_detector
Tip revision: 8ce6a9d
File Mode Size
deployment
pupil_external
pupil_src
.gitignore -rw-r--r-- 592 bytes
COPYING -rw-r--r-- 34.3 KB
COPYING.LESSER -rw-r--r-- 7.5 KB
README.md -rw-r--r-- 3.0 KB
update_license_header.py -rw-r--r-- 3.3 KB

README.md

back to top