Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
papr committed Nov 23, 2021
2 parents e68e318 + b232a4c commit 014ba65
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ repos:
- id: check-toml

- repo: https://github.com/psf/black
rev: 21.7b0
rev: 21.11b1
hooks:
- id: black
2 changes: 1 addition & 1 deletion docs/dependencies-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ python -m pip install --upgrade pip wheel
pip install -r requirements.txt
```

**NOTE:** `pyuvc` requires that you download Microsoft Visual C++ 2010 Redistributable from [microsoft](https://www.microsoft.com/en-us/download/details.aspx?id=14632). The `pthreadVC2` lib, which is used by libuvc, depends on `msvcr100.dll`.
**NOTE:** `pyuvc` requires that you download Microsoft Visual C++ 2010 Redistributable from [microsoft](https://docs.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-160). The `pthreadVC2` lib, which is used by libuvc, depends on `msvcr100.dll`.

## Modifying Pupil to Work with Windows

Expand Down

0 comments on commit 014ba65

Please sign in to comment.