Merge sc:awesome

Conflicts:
	.gitignore
	rc.lua
This commit is contained in:
crater2150 2010-09-15 22:49:13 +02:00
commit e99fc2325f
27 changed files with 499 additions and 607 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
wp
wallpaper