Merge "Apollo: Add menu action to delete current track." into cm-10.1

[android-x86/packages-apps-Eleven.git] / res / menu / theme_shop.xml

diff --git a/res/menu/theme_shop.xml b/res/menu/theme_shop.xml
index 998a77c..726fb55 100644 (file)
--- a/res/menu/theme_shop.xml
+++ b/res/menu/theme_shop.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<!--\r
-  Copyright (C) 2012 Andrew Neal\r
- \r
-  Licensed under the Apache License, Version 2.0 (the "License");\r
-  you may not use this file except in compliance with the License.\r
-  You may obtain a copy of the License at\r
- \r
-       http://www.apache.org/licenses/LICENSE-2.0\r
- \r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
--->\r
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >\r
-\r
-    <item\r
-        android:id="@+id/menu_shop"\r
-        android:icon="@drawable/ic_action_shop"\r
-        android:showAsAction="always"\r
-        android:title="@string/menu_shop"/>\r
-\r
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2012 Andrew Neal
+ 
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+       http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_shop"
+        android:icon="@drawable/ic_action_shop"
+        android:showAsAction="always"
+        android:title="@string/menu_shop"/>
+
 </menu>
\ No newline at end of file