diff options
| author |  Tom Willemsen | 2012-03-16 22:07:11 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-03-16 22:07:11 +0100 |
| commit | 251077982f22084258d742a0edbce756f6b7f5a4 (patch) | |
| tree | 07275cc257a41134136f061af28c42ba5dc2bc6f /.conkyrc | |
| parent | 1fe74dd7260402df854aab2fd388b9af74afcc45 (diff) | |
| parent | 338b3a0afd17012a77dc99b3e7580be1639d8800 (diff) | |
| download | dotfiles-251077982f22084258d742a0edbce756f6b7f5a4.tar.gz dotfiles-251077982f22084258d742a0edbce756f6b7f5a4.zip | |
Merge remote-tracking branch 'github/master' into phoenix
Diffstat (limited to '.conkyrc')
0 files changed, 0 insertions, 0 deletions