Skip to content

Wapm 4 - #43

Open
syrusakbary wants to merge 42 commits into
slimfrom
wapm-4
Open

Wapm 4#43
syrusakbary wants to merge 42 commits into
slimfrom
wapm-4

Conversation

@syrusakbary

Copy link
Copy Markdown
Member

Integration with WAPM

# Conflicts:
#	tokterm/src/cconst.rs
# Conflicts:
#	tokterm/src/cconst.rs
# Conflicts:
#	tokterm/public/index.html
#	tokterm/src/glue.rs
#	tokterm/src/state.rs
# Conflicts:
#	term-lib/src/cconst.rs
#	tokweb/public/favicon.png
#	tokweb/public/worker.js
# Conflicts:
#	term-lib/src/cconst.rs
# Conflicts:
#	term-lib/src/builtins/wax.rs
#	tokweb/js/index.js
#	tokweb/public/worker.js
#	tokweb/src/console.rs
#	tokweb/src/glue.rs
# Conflicts:
#	term-lib/Cargo.toml
#	tokweb/public/worker.js
#	wasmer-os/src/cconst.rs
#	wasmer-os/src/console.rs
#	wasmer-os/src/lib.rs
#	wasmer-os/src/txt/bad_worker.md
#	wasmer-web/package-lock.json
#	wasmer-web/package.json
#	wasmer-web/public/404.html
#	wasmer-web/public/_headers
#	wasmer-web/public/assets/favicon.ico
#	wasmer-web/public/assets/fonts/Gilroy/Gilroy-Bold.eot
#	wasmer-web/public/assets/fonts/Gilroy/Gilroy-Bold.ttf
#	wasmer-web/public/assets/fonts/Gilroy/Gilroy-Bold.woff
#	wasmer-web/public/assets/fonts/Gilroy/Gilroy-Medium.eot
#	wasmer-web/public/assets/fonts/Gilroy/Gilroy-Medium.ttf
#	wasmer-web/public/assets/fonts/Gilroy/Gilroy-Medium.woff
#	wasmer-web/public/assets/fonts/Gilroy/Gilroy-Semibold.eot
#	wasmer-web/public/assets/fonts/Gilroy/Gilroy-Semibold.ttf
#	wasmer-web/public/assets/fonts/Gilroy/Gilroy-Semibold.woff
#	wasmer-web/public/assets/fonts/Gilroy/Gilroy.css
#	wasmer-web/public/assets/fonts/Zeitung/Zeitung.css
#	wasmer-web/public/assets/fonts/Zeitung/ZeitungMonoPro-Regular.eot
#	wasmer-web/public/assets/fonts/Zeitung/ZeitungMonoPro-Regular.ttf
#	wasmer-web/public/assets/fonts/Zeitung/ZeitungMonoPro-Regular.woff
#	wasmer-web/public/assets/icon.png
#	wasmer-web/public/assets/logos/android-chrome-192x192.png
#	wasmer-web/public/assets/logos/android-chrome-512x512.png
#	wasmer-web/public/assets/logos/apple-touch-icon.png
#	wasmer-web/public/assets/logos/favicon-16x16.png
#	wasmer-web/public/assets/logos/favicon-32x32.png
#	wasmer-web/public/assets/logos/favicon.ico
#	wasmer-web/public/favicon-tok.png
#	wasmer-web/public/index.html
#	wasmer-web/public/manifest.json
#	wasmer-web/src/console.rs
#	wasmer-web/src/glue.rs
# Conflicts:
#	wasmer-os/Cargo.toml
#	wasmer-os/src/console.rs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant