Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-09-20 11:34:26 +02:00
commit d852c17468
1 changed files with 1 additions and 2 deletions

View File

@ -1,6 +1,5 @@
[Desktop Entry]
Encoding=UTF-8
Name=i3
Comment=improved dynamic tiling window manager
Exec=i3
Type=XSession
Type=Application