diff options
| author |  Tom Willemsen | 2012-04-15 18:04:13 +0000 |
|---|---|---|
| committer | Tom Willemsen | 2012-04-15 18:04:13 +0000 |
| commit | 88a63ffaa36c3cd3c6542e04806805254b3b577e (patch) | |
| tree | 8dbbc536412eb06c2c154db574af4c80873a9990 /.config | |
| parent | ab76bcaa6453450a150c6ac0550276418955887a (diff) | |
| parent | 352f142c20f5245641b1913ff652655c61759401 (diff) | |
| download | dotfiles-88a63ffaa36c3cd3c6542e04806805254b3b577e.tar.gz dotfiles-88a63ffaa36c3cd3c6542e04806805254b3b577e.zip | |
Merge remote-tracking branch 'github/master' into phoenix
Conflicts:
.xbindkeysrc.scm
Diffstat (limited to '.config')
0 files changed, 0 insertions, 0 deletions