Skip to content

Commit 31f7d5b

Browse files
committed
Merge branch 'develop' into bigpicturemode
2 parents ab9e06f + 87bbe1d commit 31f7d5b

File tree

109 files changed

+14710
-3369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+14710
-3369
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,6 @@ src-tauri/flamegraph.svg
2929
src-tauri/perf*
3030

3131
/*.AppImage
32-
/squashfs-root
32+
/squashfs-root
33+
34+
/target/

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"@tauri-apps/plugin-os": "^2.3.0",
1515
"@tauri-apps/plugin-shell": "^2.3.0",
1616
"pino": "^9.7.0",
17-
"pino-pretty": "^13.1.1"
17+
"pino-pretty": "^13.1.1",
18+
"tauri": "^0.15.0"
1819
},
1920
"devDependencies": {
2021
"@tauri-apps/cli": "^2.7.1"

0 commit comments

Comments
 (0)