Mălina-Ioana Popa a4908882c6 fix conflicts

2023-01-24 17:05:08 +01:00

..

client

switch sides

2023-01-20 14:53:05 +08:00

hbbs_http

sync: depend on web

2023-01-16 09:09:59 +08:00

lang

fix conflicts

2023-01-24 17:05:08 +01:00

platform

switch sides: linux dbus use uri as para like uni_links

2023-01-20 14:53:05 +08:00

server

switch sides: linux dbus use uri as para like uni_links

2023-01-20 14:53:05 +08:00

ui

switch sides

2023-01-20 14:53:05 +08:00

cli.rs

fix cli

2023-01-10 15:01:46 +08:00

client.rs

switch sides

2023-01-20 14:53:05 +08:00

clipboard_file.rs

spelling: clipboard

2023-01-09 12:58:33 -05:00

common.rs

fix conflicts

2023-01-12 00:35:39 +08:00

core_main.rs

Merge pull request #2838 from 21pages/switch_sides

2023-01-21 08:05:32 +08:00

flutter_ffi.rs

Merge pull request #2838 from 21pages/switch_sides

2023-01-21 08:05:32 +08:00

flutter.rs

Merge pull request #2838 from 21pages/switch_sides

2023-01-21 08:05:32 +08:00

hbbs_http.rs

sync strategy

2023-01-10 13:21:38 +08:00

ipc.rs

switch sides: use ipc to pass msg from ui to server

2023-01-20 14:53:05 +08:00

keyboard.rs

fix cur session

2023-01-20 21:03:30 +08:00

lan.rs

…

lang.rs

fix conflicts

2023-01-24 17:05:08 +01:00

lib.rs

…

license.rs

…

main.rs

fix cli

2023-01-10 15:01:46 +08:00

naming.rs

…

oboe.cc

…

oboe.patch

…

port_forward.rs

…

rc.rs

…

rendezvous_mediator.rs

spelling: rendezvous

2023-01-09 12:59:08 -05:00

server.rs

sync strategy

2023-01-10 13:21:38 +08:00

tray.rs

more comment

2023-01-19 18:26:59 +08:00

ui_cm_interface.rs

switch sides: use ipc to pass msg from ui to server

2023-01-20 14:53:05 +08:00

ui_interface.rs

fix cur session

2023-01-20 21:03:30 +08:00

ui_session_interface.rs

Merge pull request #2838 from 21pages/switch_sides

2023-01-21 08:05:32 +08:00

ui.rs

fix cur session

2023-01-20 21:03:30 +08:00