karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Merge error fix.

Browse Source 
String polar_sensor_type was left out of Sensor Type array.
This commit is contained in:
JohnG
2011-06-02 20:58:27 -04:00
parent 94344deff3
commit 9f44b1695d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/.classpath
+1 -1
View File
@@ -7,7 +7,7 @@
<classpathentry kind="lib" path="libs/google-api-client-1.2.2-alpha.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="src" path="MyTracksLib_src"/>
<classpathentry kind="lib" path="C:/Documents and Settings/John/My Documents/Projects/Eclipse/jrgert-polar-bluetooth/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
<classpathentry kind="src" path="MyTracksLib_src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
MyTracks/res/values/arrays_do_not_translate.xml
+1
View File
@@ -120,6 +120,7 @@ limitations under the License.
<item>@string/none</item>
<item>@string/ant_sensor_type</item>
<item>@string/srm_ant_bridge_sensor_type</item>
<item>@string/polar_sensor_type</item>
<item>@string/zephyr_sensor_type</item>
</array>