Merge with head.

2026-10-14 14:53:07 +02:00 · 2011-03-17 21:57:27 -07:00
parent e058854c3f
commit e59b52dcac
66 changed files with 3547 additions and 851 deletions
@@ -287,4 +287,11 @@ limitations under the License.
    <item>噴水</item>
    <item>ウェイポイント</item>
  </array>
+
+  <array name="sensor_type_options">
+    <item>なし</item>
+    <item>ANT+ センサー</item>
+    <item>SRM ANT+ ブリッジ</item>
+    <item>Zephyr Bluetooth</item>
+  </array>
 </resources>