merge heads

This commit is contained in:
Jimmy Shih
2011-11-15 16:43:45 -08:00
parent 999285fcbc
commit ae28dc01fe
99 changed files with 4799 additions and 10962 deletions
@@ -32,7 +32,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:textSize="16dip"
android:textColor="#fff"
android:text="@string/waypointslist_pick_one"
android:text="@string/marker_list_pick_one"
android:layout_weight="0"/>
</LinearLayout>
@@ -44,11 +44,11 @@ limitations under the License.
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/waypointslist_btn_insert_statistics"
android:layout_gravity="left"
android:text="@string/waypointslist_btn_insert_statistics"
android:text="@string/marker_list_insert_statistics"
style="@style/Button"/>
<Button android:id="@+id/waypointslist_btn_insert_waypoint"
android:layout_gravity="right"
android:text="@string/waypointslist_btn_insert_waypoint"
android:text="@string/marker_list_insert_waypoint"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>