Skip to content

Commit

Permalink
Merge branch 'upstream'
Browse files Browse the repository at this point in the history
  • Loading branch information
Diordany committed Sep 27, 2024
2 parents 49027dc + e59a375 commit be8d3eb
Show file tree
Hide file tree
Showing 7 changed files with 722 additions and 285 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ image = { version = "^0.25", features = ["png"], default-features = false }
image_autopilot = { package = "image", version = "0.22.5", features = [], default-features = false }
percent-encoding = "2.1.0"
qrcode = "0.14.0"
rand = "0.8.5"
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0"
signal-hook = "0.3.17"
Expand Down
2 changes: 1 addition & 1 deletion src/capturable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub mod core_graphics;
#[cfg(target_os = "linux")]
pub mod pipewire;
#[cfg(target_os = "linux")]
pub mod pipewire_dbus;
pub mod remote_desktop_dbus;
pub mod testsrc;

#[cfg(target_os = "windows")]
Expand Down
Loading

0 comments on commit be8d3eb

Please sign in to comment.