diff options
| author | shmibs <shmibs@gmail.com> | 2014-10-23 18:33:39 -0700 |
|---|---|---|
| committer | shmibs <shmibs@gmail.com> | 2014-10-23 18:33:39 -0700 |
| commit | 774444eb9959b4f260382d1115c6c6160fa6e70c (patch) | |
| tree | 184a915bea14be8922b2c4f329f59ae412f4de83 /.config | |
| parent | e5cf9723cd9f002de3e960f79a56d05304f730f9 (diff) | |
| parent | 42c03c138af4fed3ef52bcb67b2a3d601cd62631 (diff) | |
| download | dotfiles-774444eb9959b4f260382d1115c6c6160fa6e70c.tar.gz | |
Merge branch 'master' of https://github.com/shmibs/dotfiles
Conflicts:
.xinitrc
Diffstat (limited to '.config')
0 files changed, 0 insertions, 0 deletions