Merge branch 'master' of https://github.com/Ambrevar/home-config

Browse Source

Conflicts:
	.config/awesome/rc.lua
	.config/awesome/themes/getskin.sh
	.save

master

Ambrevar 2012-06-18 11:07:35 +01:00

parent 77912ddfac 46ebdd6eaa

commit 94e143cf1b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available