diff options
| author |  Tom Willemsen | 2012-10-17 08:48:46 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-17 08:48:46 +0200 |
| commit | 821793e7deba56da5932ed42957ffefbe140ce22 (patch) | |
| tree | 5ee090c9d1e3e0793d79f5790d53141a20f12912 /.fonts.conf | |
| parent | 862088a69158e2f8f2b6b6b7054c73bae6c40b4c (diff) | |
| parent | b74622f11bacbb696f3cba17f399b0ea77f76dbd (diff) | |
| download | dotfiles-821793e7deba56da5932ed42957ffefbe140ce22.tar.gz dotfiles-821793e7deba56da5932ed42957ffefbe140ce22.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.xinitrc
Diffstat (limited to '.fonts.conf')
0 files changed, 0 insertions, 0 deletions