Merge branch 'master' into next

2012-09-20 11:34:26 +02:00 · 2012-09-20 11:34:26 +02:00 · d852c17468
commit d852c17468
parent f039a0ded4 393a1c0851
1 changed files with 1 additions and 2 deletions
--- a/i3.xsession.desktop
+++ b/i3.xsession.desktop
@ -1,6 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=i3
 Comment=improved dynamic tiling window manager
 Exec=i3
-Type=XSession
+Type=Application