Skip to content

Commit

Permalink
change file name to LicenseRef-Slint-Royalty-free-1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@aurindam
aurindam committed Apr 15, 2024
1 parent cc4629f commit 17dd994
Show file tree
Hide file tree
Showing 1,231 changed files with 4,963 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .cargo/config.toml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

[alias]
xtask = "run --package xtask --"
Expand Down
4 changes: 4 additions & 0 deletions .clang-format
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

---
# Webkit style was loosely based on the Qt style
Expand Down
4 changes: 4 additions & 0 deletions .clippy.toml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

type-complexity-threshold = 2500
too-many-arguments-threshold = 10
4 changes: 4 additions & 0 deletions .github/actions/codesign/action.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

---
name: Apple Codesign Binary
Expand Down
4 changes: 4 additions & 0 deletions .github/actions/install-linux-dependencies/action.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

# cSpell: ignore libxcb libxkbcommon xfixes
---
Expand Down
4 changes: 4 additions & 0 deletions .github/actions/install-nodejs/action.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

---
name: Install NodeJS
Expand Down
4 changes: 4 additions & 0 deletions .github/actions/setup-rust/action.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

# cSpell: ignore debuginfo rustflags swatinem

Expand Down
4 changes: 4 additions & 0 deletions .github/actions/test-online-editor/action.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

# cSpell: ignore vite

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build_docs.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

# Build various demo binaries, c++ packages and documentation and publish them on the website
name: Build docs
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

name: CI

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/cpp_package.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

name: Build the C++ binary package

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/crater.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

# This workflow checks out and build a bunch of crates that uses Slint,
# with the current branch
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/embedded_build.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

name: Embedded Build

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/nightly_snapshot.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

# Build various demo binaries, c++ packages and documentation and publish them on the website
name: Nightly snapshot
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/publish_npm_package.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

name: Publish npm package to npm registry

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/slint_tool_binary.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

name: Build slint-viewer or -lsp binary

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/spellcheck.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

name: "Check spelling"
on:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/torizon_demos.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

name: Rust Demos built for Torizon

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/translations.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

# Run slint-tr-extractor and msgfmt
name: Update Translations
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tree_sitter.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

name: "Tree Sitter Test"
on:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/upgrade_version.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

name: Upgrade Version Number

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/upload_esp_idf_component.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

name: Upload component to ESP-IDF component registry

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/wasm_demos.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

name: Build wasm demos

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/wasm_editor_and_interpreter.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

---
name: Build and test the slintpad and required WASM binaries
Expand Down
4 changes: 4 additions & 0 deletions .prettierrc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

tabWidth: 4
32 changes: 32 additions & 0 deletions .reuse/dep5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ License: CC-BY-ND-4.0

Files: .gitattributes .gitignore */.gitignore .dockerignore .prettierignore .pre-commit-config.yaml .vscode/* cspell.json rustfmt.toml .mailmap */.eslintrc.yml Cargo.lock */.npmignore
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

Files: api/cpp/docs/*/*.html api/cpp/docs/*/*.css docs/*/*.css docs/*/*.html docs/*/book.toml docs/*/package.json
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
Expand All @@ -26,11 +30,19 @@ License: MIT

Files: api/*/*.json
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial

Files: examples/*.json examples/*/README examples/*/README.txt examples/cpp/qt_viewer/interface.ui
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial

Files: examples/*.json examples/*/README examples/*/README.txt examples/cpp/qt_viewer/interface.ui
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

Files: examples/memory/icons/*.svg examples/memory/icons/*.png
Copyright: Fontawesome project <https://fontawesome.com/license/free>
Expand All @@ -46,6 +58,17 @@ License: LicenseRef-qskinny

Files: editors/sublime/LSP.sublime-settings
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial

Files: tools/slintpad/*.html tools/slintpad/styles/*.css tools/slintpad/*.json
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial

Files: editors/vscode/*.json editors/vscode/css/*.css editors/tree-sitter-slint/corpus/*.txt editors/vscode/static/**/*.html editors/vscode/static/assets/img/bg-dark.svg editors/vscode/static/assets/img/slint-*.svg
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial

Files: tools/slintpad/*.html tools/slintpad/styles/*.css tools/slintpad/*.json
Expand All @@ -55,6 +78,7 @@ License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-comme
Files: editors/vscode/*.json editors/vscode/css/*.css editors/tree-sitter-slint/corpus/*.txt editors/vscode/static/**/*.html editors/vscode/static/assets/img/bg-dark.svg editors/vscode/static/assets/img/slint-*.svg
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

Files: editors/vscode/static/assets/img/cpp_logo.svg
Copyright: Copyright © 2017 Jeremy Kratz
Expand All @@ -70,11 +94,19 @@ License: CC0-1.0

Files: tests/screenshots/**/*.png
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial

Files: api/node/__test__/resources/*.png
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial

Files: api/node/__test__/resources/*.png
Copyright: Copyright © SixtyFPS GmbH <[email protected]>
License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

Files: examples/carousel/icons/*.svg
Copyright: Material Icons <https://fonts.google.com/icons?selected=Material+Iconse>
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<<<<<<< HEAD
<!-- Copyright © SixtyFPS GmbH <[email protected]> ; SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial -->
=======
<!-- Copyright © SixtyFPS GmbH <[email protected]> ; SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial -->
>>>>>>> 303633443647db52f33842b9707e25e3067db232
# Changelog
All notable changes to this project are documented in this file.
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

cmake_minimum_required(VERSION 3.21)

Expand Down
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<<<<<<< HEAD
<!-- Copyright © SixtyFPS GmbH <[email protected]> ; SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial -->
=======
<!-- Copyright © SixtyFPS GmbH <[email protected]> ; SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial -->
>>>>>>> 303633443647db52f33842b9707e25e3067db232
# Contributing

Expand Down
8 changes: 8 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copyright © SixtyFPS GmbH <[email protected]>
<<<<<<< HEAD
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial
=======
# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial
>>>>>>> 303633443647db52f33842b9707e25e3067db232

[workspace]
members = [
Expand Down Expand Up @@ -100,7 +104,11 @@ documentation = "https://slint.dev/docs"
edition = "2021"
homepage = "https://slint.dev"
keywords = ["gui", "toolkit", "graphics", "design", "ui"]
<<<<<<< HEAD
license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial"
=======
license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial"
>>>>>>> 303633443647db52f33842b9707e25e3067db232
repository = "https://github.com/slint-ui/slint"
rust-version = "1.73"
version = "1.6.0"
Expand Down
4 changes: 4 additions & 0 deletions FAQ.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ types of programming languages.

## Licensing

<<<<<<< HEAD
Slint is available under a [royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free-1.2.md) or [GNU GPLv3](LICENSES/GPL-3.0-only.txt), at your choice. For paid plans, visit our website [https://slint.dev](https://slint.dev) or contact us at [[email protected]](mailto:[email protected]).
=======
Slint is available under a [royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free.md) or [GNU GPLv3](LICENSES/GPL-3.0-only.txt), at your choice. For paid plans, visit our website [https://slint.dev](https://slint.dev) or contact us at [[email protected]](mailto:[email protected]).
>>>>>>> 303633443647db52f33842b9707e25e3067db232
### Royalty-free license

Expand Down
Loading

0 comments on commit 17dd994

Please sign in to comment.