Commit graph

4 commits

Author SHA1 Message Date
da108db5dc Merge branch 'master' of github.com:stv0g/dotfiles
Conflicts:
	.bash_aliases
2013-01-19 18:13:26 +01:00
2c85d88a6c added aliases 2013-01-19 18:12:29 +01:00
e6d96f1773 files from my main machine
Please enter the commit message for your changes. Lines starting
2013-01-19 18:05:52 +01:00
31682ddf9a initial commit 2013-01-19 17:49:34 +01:00