Merge branch 'master' of sc:awesome

Conflicts:
	bindings.lua
	rules.lua
	wibox.lua
This commit is contained in:
crater2150 2011-05-09 21:52:56 +02:00
commit 34c652d058
4 changed files with 96 additions and 26 deletions

View file

@ -37,10 +37,12 @@ awful.rules.rules = {
callback = awful.client.setslave},
{ rule = { class = "Claws-mail" },
properties = { tag = tags[2][4] } },
{ rule = { instance = "Gmutt" },
properties = { tag = tags[2][4] } },
{ rule = { class = "Gmpc" },
properties = { tag = tags[1][6] } },
properties = { tag = tags[2][6] } },
{ rule = { class = "Deluge" },
properties = { tag = tags[1][7] } },
properties = { tag = tags[2][7] } },
{ rule = { class = "Xhtop" },
properties = { tag = tags[1][22] } },
{ rule = { class = "Cellwriter" },