diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
commit | b32e36625b44b5c002c417ab4faf6311258c7671 (patch) | |
tree | 87f91f6f7d9ccb229f9c7613f5411534bd504f5e /staging/glibc/locale.gen.txt | |
parent | 1a274201c465801ed2271018f426f0eaf7098215 (diff) | |
parent | 35c30674b2b901077a809a6f1d8e5a0115098c8b (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mplayer2/PKGBUILD
community/pcmanfm/PKGBUILD
extra/liblrdf/PKGBUILD
extra/php-apc/PKGBUILD
extra/sqlite/PKGBUILD
kde-unstable/libkgapi/PKGBUILD
kde-unstable/soprano/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
Diffstat (limited to 'staging/glibc/locale.gen.txt')
-rw-r--r-- | staging/glibc/locale.gen.txt | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/staging/glibc/locale.gen.txt b/staging/glibc/locale.gen.txt deleted file mode 100644 index ccdd81734..000000000 --- a/staging/glibc/locale.gen.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Configuration file for locale-gen -# -# lists of locales that are to be generated by the locale-gen command. -# -# Each line is of the form: -# -# <locale> <charset> -# -# where <locale> is one of the locales given in /usr/share/i18n/locales -# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps -# -# Examples: -# en_US ISO-8859-1 -# en_US.UTF-8 UTF-8 -# de_DE ISO-8859-1 -# de_DE@euro ISO-8859-15 -# -# The locale-gen command will generate all the locales, -# placing them in /usr/lib/locale. -# -# A list of supported locales is included in this file. -# Uncomment the ones you need. -# |