diff options
author | daniel oeh <daniel.oeh@gmail.com> | 2014-07-26 14:42:59 +0200 |
---|---|---|
committer | daniel oeh <daniel.oeh@gmail.com> | 2014-07-26 14:42:59 +0200 |
commit | 583b2adaae5769fb8bee4d63e4ef10846d7de1b6 (patch) | |
tree | 2dfe8481d75fc7a68cee495c3e91bce0a4e5b0c0 /res/values/ids.xml | |
parent | 1673f6eaf83606a78ce3928b2d7c33d4ff0de862 (diff) | |
parent | 460e061d35e45268d3dcfebeba00e7231ce8cfd0 (diff) | |
download | AntennaPod-583b2adaae5769fb8bee4d63e4ef10846d7de1b6.zip |
Merge branch 'develop'0.9.9.2
Conflicts:
submodules/dslv
Diffstat (limited to 'res/values/ids.xml')
-rw-r--r-- | res/values/ids.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/values/ids.xml b/res/values/ids.xml index c1d80d375..90e405fde 100644 --- a/res/values/ids.xml +++ b/res/values/ids.xml @@ -12,6 +12,7 @@ <item name="open_in_browser_item" type="id"/> <item name="copy_url_item" type="id"/> <item name="share_url_item" type="id"/> + <item name="go_to_position_item" type="id"/> <item name="organize_queue_item" type="id"/> <item name="drag_handle" type="id"/> <item name="skip_episode_item" type="id"/> @@ -21,5 +22,6 @@ <item name="imageloader_key" type="id"/> <item name="notification_gpodnet_sync_error" type="id"/> <item name="notification_gpodnet_sync_autherror" type="id"/> - + <item name="undobar_button" type="id"/> + <item name="undobar_message" type="id"/> </resources>
\ No newline at end of file |