diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-02-16 11:37:46 -0500 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-02-16 11:37:46 -0500 |
| commit | 7a2dd3a7e3f465141c90abedcb814f9ee9712edd (patch) | |
| tree | 78a4911e665d84fc44d365573d24c593c705813e /.config/fontconfig | |
| parent | c8f419eab92045a069c8f444c77c8ff81aa36fa2 (diff) | |
| parent | ca3e04971996ebe2eebf88775e96bbf547aa0abe (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs/master
Conflicts:
.config/login.d/02_tmpdir.sh
.config/login.d/90_dot-runtime.sh
Diffstat (limited to '.config/fontconfig')
0 files changed, 0 insertions, 0 deletions