Meshtastic-Apple/Meshtastic
Benjamin Faershtein 9693625dcf Merge branch 'upstream/main' into noise-floor
Conflicts resolved:
- AccessoryManager+ToRadio.swift: Keep both sendLocalStatsRequest and exchangeUserInfo
- NodeDetail.swift: Keep both RequestLocalStatsButton and ExchangeUserInfoButton
- project.pbxproj: Add ExchangeUserInfoButton.swift to project
2026-01-17 19:38:55 -08:00
..
Accessory Merge branch 'upstream/main' into noise-floor 2026-01-17 19:38:55 -08:00
AppIntents Fixed the message node intent (#1362) 2025-08-29 08:06:55 -07:00
Assets.xcassets 2.7.6 Working Changes (#1479) 2025-12-21 12:15:01 -08:00
Enums 2.7.6 Working Changes (#1479) 2025-12-21 12:15:01 -08:00
Export Add noise floor 2026-01-17 19:30:01 -08:00
Extensions 2.7.7 Working Changes (#1551) 2026-01-15 14:13:40 -08:00
Helpers Merge branch 'upstream/main' into noise-floor 2026-01-17 19:38:55 -08:00
Measurement little feets 2024-08-04 15:53:59 -07:00
Meshtastic.xcdatamodeld Add noise floor 2026-01-17 19:30:01 -08:00
Model Add noise floor 2026-01-17 19:30:01 -08:00
Persistence 2.7.6 Working Changes (#1479) 2025-12-21 12:15:01 -08:00
Preview Content/Preview Assets.xcassets Rename Project to satisfy app review 2022-06-24 08:00:18 -07:00
Resources 2.7.6 Working Changes (#1479) 2025-12-21 12:15:01 -08:00
Router 2.7.4 Working Changes (#1415) 2025-10-05 17:51:18 -07:00
Tips Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341) 2025-08-27 08:09:02 -07:00
Views Merge branch 'upstream/main' into noise-floor 2026-01-17 19:38:55 -08:00
AppState.swift Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341) 2025-08-27 08:09:02 -07:00
Info.plist 2.7.3 Working Changes (#1404) 2025-09-18 13:19:45 -07:00
Meshtastic.entitlements Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341) 2025-08-27 08:09:02 -07:00
MeshtasticApp.swift 2.7.6 Working Changes (#1479) 2025-12-21 12:15:01 -08:00
MeshtasticAppDelegate.swift Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341) 2025-08-27 08:09:02 -07:00
RELEASENOTES.md Rename Project to satisfy app review 2022-06-24 08:00:18 -07:00
ShowTime.swift Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341) 2025-08-27 08:09:02 -07:00