| 
							
							
								 rustdesk | 31eea1482b | remove stupid group, bad implementation, buggy, and not usable | 2023-06-23 17:05:48 +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 | 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 |  | 
			
				
					| 
							
							
								 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 |  |