diff options
| author |  Tom Willemsen | 2012-07-09 19:16:54 +0000 |
|---|---|---|
| committer | Tom Willemsen | 2012-07-09 19:16:54 +0000 |
| commit | 72d124100d3fc4fb7ee9ada43385867b0c171a4d (patch) | |
| tree | 8df784474eb8519032eefcc4e8f92f2dd009ebcc /.conkerorrc/theme.js | |
| parent | 8b1b423d0ae8e3b899658b05ae4ecb1c430b618f (diff) | |
| parent | 65dee41a9237a67db713b2bc1bdbcc8a2cec6f67 (diff) | |
| download | dotfiles-72d124100d3fc4fb7ee9ada43385867b0c171a4d.tar.gz dotfiles-72d124100d3fc4fb7ee9ada43385867b0c171a4d.zip | |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.config/fish/config.fish
.xinitrc
Diffstat (limited to '.conkerorrc/theme.js')
0 files changed, 0 insertions, 0 deletions