diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:24:31 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:24:31 +0100 |
commit | 1e9a681a0fc22e40abe393aa9f015a12f7b6dc63 (patch) | |
tree | 250019d7025db0f012d830cc7b257b091347f97f /package/xbmc/patches/002-defaultsutf8.patch | |
parent | bf73dab7201f06f26290c4ceb5cdcca603f027d7 (diff) | |
parent | 1b6a9fa3f18fdeaa3f3869a22cd91490ffec608c (diff) |
resolve merge conflict
Diffstat (limited to 'package/xbmc/patches/002-defaultsutf8.patch')
-rw-r--r-- | package/xbmc/patches/002-defaultsutf8.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/package/xbmc/patches/002-defaultsutf8.patch b/package/xbmc/patches/002-defaultsutf8.patch deleted file mode 100644 index fad88800d..000000000 --- a/package/xbmc/patches/002-defaultsutf8.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur xbmc-12.3-Frodo.orig/language/English/langinfo.xml xbmc-12.3-Frodo/language/English/langinfo.xml ---- xbmc-12.3-Frodo.orig/language/English/langinfo.xml 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/language/English/langinfo.xml 2014-01-14 19:34:44.869490320 +0100 -@@ -48,8 +48,8 @@ - - <language locale="en"> - <charsets> -- <gui>CP1252</gui> -- <subtitle>CP1252</subtitle> -+ <gui>UTF-8</gui> -+ <subtitle>UTF-8</subtitle> - </charsets> - - <dvd> -diff -Nur xbmc-12.3-Frodo.orig/language/German/langinfo.xml xbmc-12.3-Frodo/language/German/langinfo.xml ---- xbmc-12.3-Frodo.orig/language/German/langinfo.xml 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/language/German/langinfo.xml 2014-01-14 19:34:20.997392956 +0100 -@@ -2,8 +2,8 @@ - <language locale="de"> - - <charsets> -- <gui unicodefont="false">CP1252</gui> -- <subtitle>CP1252</subtitle> -+ <gui unicodefont="false">UTF-8</gui> -+ <subtitle>UTF-8</subtitle> - </charsets> - - <dvd> |