summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-03-14 12:17:03 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-03-14 12:17:03 +0000
commit94d563839790787702d6d60e9143f043257160b1 (patch)
treead3bdf2be56f9d1656278709d23f8bc997ffb4be /x11-apps/xinit
parentAvoid unaligned loads/stores in USE=hpn cipher code #498632 by Bruno. (diff)
downloadgentoo-2-94d563839790787702d6d60e9143f043257160b1.tar.gz
gentoo-2-94d563839790787702d6d60e9143f043257160b1.tar.bz2
gentoo-2-94d563839790787702d6d60e9143f043257160b1.zip
Punt deprecated Encoding= line from .desktop file
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'x11-apps/xinit')
-rw-r--r--x11-apps/xinit/ChangeLog7
-rw-r--r--x11-apps/xinit/files/Xsession.desktop1
2 files changed, 5 insertions, 3 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index f7faab73d74a..80b158a54501 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-apps/xinit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.251 2013/10/08 05:03:50 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.252 2014/03/14 12:17:03 ssuominen Exp $
+
+ 14 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> files/Xsession.desktop:
+ Punt deprecated Encoding= line from .desktop file
08 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xinit-1.3.3.ebuild:
Stable for x86, wrt bug #475480
diff --git a/x11-apps/xinit/files/Xsession.desktop b/x11-apps/xinit/files/Xsession.desktop
index 4ed3a5cd8bd9..0c5adb9d84f8 100644
--- a/x11-apps/xinit/files/Xsession.desktop
+++ b/x11-apps/xinit/files/Xsession.desktop
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=XSession
Comment=This session logs you into your custom Xsession
Exec=/etc/X11/Sessions/Xsession