https://github.com/pupil-labs/pupil
Revision 2d52b068a467d2dd472213d9687cfd776e6504b6 authored by Moritz Kassner on 09 September 2015, 10:58:01 UTC, committed by Moritz Kassner on 09 September 2015, 10:58:01 UTC
Conflicts:
	pupil_src/capture/eye.py
	pupil_src/capture/world.py
2 parent s c1eca74 + aabb92e
History
Tip revision: 2d52b068a467d2dd472213d9687cfd776e6504b6 authored by Moritz Kassner on 09 September 2015, 10:58:01 UTC
Merge branch 'master' of https://github.com/pupil-labs/pupil
Tip revision: 2d52b06

back to top