diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2023-09-17 21:06:31 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2023-09-17 21:06:31 +0300 |
| commit | 51a8dde3fa49f1bfb4cd3cab793f06fd1521b317 (patch) | |
| tree | 46e6a93f7a69b3c91fc39cd85d109abf9fcc00f4 | |
| parent | 7434a0587738599f6f649b5730c0f0d1e3830bcd (diff) | |
| parent | bca12066cbe0e222b55b1a340cf0b74cf2d6dbbe (diff) | |
Conflicts resolved
| -rw-r--r-- | .github/workflows/build-test.yml | 2 | ||||
| -rw-r--r-- | NesTiler/Program.cs | 2 | ||||
| -rw-r--r-- | README.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 52f271c..91d9b15 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -33,7 +33,7 @@ jobs: APP_NAME: nestiler
PROJECT_PATH: ./NesTiler
OUTPUT_DIR: output
- CONFIGURATION: Debug
+ CONFIGURATION: Interim
OUTPUT_SUBDIR: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.sc }}
OUTPUT_FILE: nestiler-${{ matrix.os }}-${{ matrix.arch }}${{ matrix.sc == 'self-contained' && '-self-contained' || '' }}.${{ matrix.os == 'win' && 'zip' || 'tar.gz' }}
steps:
diff --git a/NesTiler/Program.cs b/NesTiler/Program.cs index 5884aa0..b5c0b40 100644 --- a/NesTiler/Program.cs +++ b/NesTiler/Program.cs @@ -27,7 +27,7 @@ namespace com.clusterrr.Famicom.NesTiler #if !INTERIM
$"v{versionStr}"
#else
- "intrerim version"
+ "interim version"
#endif
#if DEBUG
+ " (debug)"
@@ -234,7 +234,7 @@ Examples: ## Download
You can always download latest version at [https://github.com/ClusterM/NesTiler/releases](https://github.com/ClusterM/NesTiler/releases).
-Also, you can download automatic nightly builds: [http://clusterm.github.io/NesTiler/](http://clusterm.github.io/NesTiler/).
+Also, you can download automatic interim builds: [http://clusterm.github.io/NesTiler/](http://clusterm.github.io/NesTiler/).
## Donate
* [Donation Alerts](https://www.donationalerts.com/r/clustermeerkat)
|