| 
							
							
								 fufesou | 74a2929bc9 | flutter_desktop_connection_2: debug lan Signed-off-by: fufesou <shuanglongchen@yeah.net> | 2022-08-02 13:10:09 +08:00 |  | 
			
				
					| 
							
							
								 Kingtous | c4451b3cc7 | fix: merge conflict | 2022-08-01 14:33:08 +08:00 |  | 
			
				
					| 
							
							
								 Kingtous | 3b9c62b05d | Merge remote-tracking branch 'rustdesk/master' into flutter_desktop # Conflicts:
#	.github/workflows/ci.yml
#	Cargo.lock
#	Cargo.toml
#	flutter/lib/common.dart
#	flutter/lib/mobile/pages/remote_page.dart
#	flutter/lib/mobile/pages/server_page.dart
#	flutter/lib/mobile/pages/settings_page.dart
#	flutter/lib/mobile/widgets/dialog.dart
#	flutter/lib/models/model.dart
#	flutter/lib/models/server_model.dart
#	src/client.rs
#	src/common.rs
#	src/ipc.rs
#	src/mobile_ffi.rs
#	src/rendezvous_mediator.rs
#	src/ui.rs | 2022-08-01 10:44:05 +08:00 |  | 
			
				
					| 
							
							
								 Kingtous | 3f2aaae1ff | opt: merge addon Signed-off-by: Kingtous <kingtous@qq.com> | 2022-06-27 11:51:29 +08:00 |  | 
			
				
					| 
							
							
								 Kingtous | 4a89469b84 | Merge remote-tracking branch 'rustdesk/master' into flutter_desktop # Conflicts:
#	Cargo.lock
#	Cargo.toml
#	build.rs
#	flutter/.gitignore
#	flutter/lib/common.dart
#	flutter/lib/mobile/pages/remote_page.dart
#	flutter/lib/models/model.dart
#	flutter/lib/models/native_model.dart
#	flutter/lib/models/server_model.dart
#	flutter/pubspec.lock
#	flutter/pubspec.yaml
#	src/client.rs
#	src/client/file_trait.rs
#	src/flutter.rs
#	src/mobile_ffi.rs
#	src/ui.rs | 2022-06-27 11:18:53 +08:00 |  | 
			
				
					| 
							
							
								 kingtous | 985c616ca6 | refactor: make multi FFI object && initial flutter multi sessions support Signed-off-by: Kingtous <kingtous@qq.com> | 2022-06-13 21:07:26 +08:00 |  | 
			
				
					| 
							
							
								 csf | 317b350d2b | multi remote instances 0.5 | 2022-05-31 22:09:36 +08:00 |  | 
			
				
					| 
							
							
								 Kingtous | 708801bdf6 | feat: add single/multi window manager wrapper & fix issue causing input twice | 2022-05-29 17:23:27 +08:00 |  | 
			
				
					| 
							
							
								 SoLongAndThanksForAllThePizza | 9dd6e40003 | add comment | 2022-05-28 03:56:42 +08:00 |  | 
			
				
					| 
							
							
								 csf | fa5f48638f | adapt to flutter 3 | 2022-05-26 18:25:16 +08:00 |  | 
			
				
					| 
							
							
								 Kingtous | a81e2f9859 | refactor: split desktop & mobile | 2022-05-25 14:12:35 +08:00 |  |