Skip to content

Commit

Permalink
Merge branch 'emilk:master' into patch64
Browse files Browse the repository at this point in the history
  • Loading branch information
rustbasic authored Jul 2, 2024
2 parents ee437a1 + f0e2bd8 commit 7f9313c
Show file tree
Hide file tree
Showing 164 changed files with 3,188 additions and 1,753 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Please read the "Making a PR" section of [`CONTRIBUTING.md`](https://github.com/
* The PR title is what ends up in the changelog, so make it descriptive!
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to `egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for maintainers to add commits to your PR.
* Do NOT open PR:s from your `master` branch, as that makes it hard for maintainers to test and add commits to your PR.
* Remember to run `cargo fmt` and `cargo clippy`.
* Open the PR as a draft until you have self-reviewed it and run `./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
- name: wasm-bindgen
uses: jetli/[email protected]
with:
version: "0.2.90"
version: "0.2.92"

- run: ./scripts/wasm_bindgen_check.sh --skip-setup

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Make a PR to add it as a link to [`README.md`](README.md#integrations) so others
## Testing the web viewer
* Build with `scripts/build_demo_web.sh`
* Host with `scripts/start_server.sh`
* Open <http://localhost:8888/index.html>
* Open <http://localhost:8765/index.html>


## Code Style
Expand Down
Loading

0 comments on commit 7f9313c

Please sign in to comment.