diff options
| author | ben <benjaminfranzke@googlemail.com> | 2010-03-26 16:44:31 +0100 |
|---|---|---|
| committer | ben <benjaminfranzke@googlemail.com> | 2010-03-26 16:44:31 +0100 |
| commit | b4934dbaee78584e802c29bae23524044cb7bb79 (patch) | |
| tree | 8b359a1a810c18ec86c714281d0c065faee02575 /.config/conky | |
| parent | e2c50941bdf69f8bc1c77c44a27eb29c6c55da17 (diff) | |
| parent | 6ad8884c16562bb00e987e46c3424edc5e43b961 (diff) | |
| download | dotfiles-b4934dbaee78584e802c29bae23524044cb7bb79.tar.gz dotfiles-b4934dbaee78584e802c29bae23524044cb7bb79.tar.bz2 dotfiles-b4934dbaee78584e802c29bae23524044cb7bb79.zip | |
Merge branch 'master' of github.com:benf/dotfiles
Conflicts:
.config/bash/alias.sh
Diffstat (limited to '.config/conky')
0 files changed, 0 insertions, 0 deletions