Merge with head.

2011-07-05 16:33:45 -07:00
parent b588bb02f4
commit 29df8762e2
83 changed files with 3928 additions and 2855 deletions
@@ -272,11 +272,4 @@ limitations under the License.
    <item>путевая точка</item>
  </array>

-  <array name="sensor_type_options">
-    <item>Нет</item>
-    <item>ANT+ Sensors</item>
-    <item>SRM ANT+ Bridge</item>
-    <item>Zephyr Bluetooth</item>
-  </array>
-
 </resources>