Merge to head

2011-12-06 16:34:48 -02:00
parent bb3a14aac0
commit ebe8cbc798
94 changed files with 2793 additions and 1892 deletions
@@ -251,6 +251,6 @@ limitations under the License.
    <item>@string/waypoint_type_tunnel</item>
    <item>@string/waypoint_type_waterfall</item>
    <item>@string/waypoint_type_water_fountain</item>
-    <item>@string/waypoint_type_way_point</item>
+    <item>@string/waypoint_type_waypoint</item>
  </string-array>
 </resources>