| commit | 13fca8d729e188ca71802408b095d256a499a750 | [log] [tgz] |
|---|---|---|
| author | jrizzoli <joey@cyanogenmoditalia.it> | Thu Nov 05 14:24:50 2015 +0100 |
| committer | jrizzoli <joey@cyanogenmoditalia.it> | Thu Nov 05 14:24:50 2015 +0100 |
| tree | 71db2668cefc0b9aa803289390f1a884a6447f74 | |
| parent | f63f311e2ce4c7986404d343bec777f32e40a04e [diff] |
gello: fix mismerge Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
diff --git a/src/channels/cm/branding/BRANDING b/channels/cm/branding/BRANDING similarity index 100% rename from src/channels/cm/branding/BRANDING rename to channels/cm/branding/BRANDING
diff --git a/src/channels/cm/res/mipmap-hdpi/ic_launcher_browser.png b/channels/cm/res/mipmap-hdpi/ic_launcher_browser.png similarity index 100% rename from src/channels/cm/res/mipmap-hdpi/ic_launcher_browser.png rename to channels/cm/res/mipmap-hdpi/ic_launcher_browser.png Binary files differ
diff --git a/src/channels/cm/res/mipmap-mdpi/ic_launcher_browser.png b/channels/cm/res/mipmap-mdpi/ic_launcher_browser.png similarity index 100% rename from src/channels/cm/res/mipmap-mdpi/ic_launcher_browser.png rename to channels/cm/res/mipmap-mdpi/ic_launcher_browser.png Binary files differ
diff --git a/src/channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png b/channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png similarity index 100% rename from src/channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png rename to channels/cm/res/mipmap-xhdpi/ic_launcher_browser.png Binary files differ
diff --git a/src/channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png b/channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png similarity index 100% rename from src/channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png rename to channels/cm/res/mipmap-xxhdpi/ic_launcher_browser.png Binary files differ
diff --git a/src/channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png b/channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png similarity index 100% rename from src/channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png rename to channels/cm/res/mipmap-xxxhdpi/ic_launcher_browser.png Binary files differ
diff --git a/src/gello/res/drawable/ic_action_tabswitcher_inverted.xml b/res/drawable/ic_action_tabswitcher_inverted.xml similarity index 100% rename from src/gello/res/drawable/ic_action_tabswitcher_inverted.xml rename to res/drawable/ic_action_tabswitcher_inverted.xml
diff --git a/src/gello/res/drawable/ic_suggest_history_inverted.xml b/res/drawable/ic_suggest_history_inverted.xml similarity index 100% rename from src/gello/res/drawable/ic_suggest_history_inverted.xml rename to res/drawable/ic_suggest_history_inverted.xml
diff --git a/src/gello/res/values/about.xml b/src/gello/res/values/about.xml deleted file mode 100644 index 2a2ef6e..0000000 --- a/src/gello/res/values/about.xml +++ /dev/null
@@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Text to display in about dialog --> -<string name="about_text" formatted="false"> - -Version: 42.0.2311.187041\n -Built: Mon Sep 28 21:32:13 CEST 2015\n -Host: envy-linux\n -User: joey\n -Hash: ccad148 (2311)\n -</string> -</resources>
