diff options
| author |  Tom Willemsen | 2012-12-05 00:44:09 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-12-05 00:44:09 +0100 |
| commit | 6278e2e634b05027d31220afd328a9f7fe77c6f1 (patch) | |
| tree | 3dbec6a3880ca980694def0d737a477b68254691 /.Xdefaults | |
| parent | fa717d86a07d009ab324a40cd8dbf539e61a9da3 (diff) | |
| parent | 15adc911da3f5b527c74b6bb67d677898d6a173e (diff) | |
| download | dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.tar.gz dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.Xdefaults')
| -rw-r--r-- | .Xdefaults | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -29,27 +29,27 @@ urxvt.background: #111113 urxvt.foreground: #eeeeec urxvt.color0: #171719 -urxvt.color8: #222224 +urxvt.color8: #999999 -urxvt.color1: #8b1a1a -urxvt.color9: #ff5d55 +urxvt.color1: #973732 +urxvt.color9: #ff756e -urxvt.color2: #4e9a06 +urxvt.color2: #405c2e urxvt.color10: #9ad870 -urxvt.color3: #c4a000 -urxvt.color11: #cfce29 +urxvt.color3: #835c0e +urxvt.color11: #ffbb56 urxvt.color4: #2729b6 urxvt.color12: #78a2c1 -urxvt.color5: #5c3566 -urxvt.color13: #ad7fa8 +urxvt.color5: #5c325d +urxvt.color13: #c39cc3 -urxvt.color6: #9f5902 -urxvt.color14: #e9b96e +urxvt.color6: #208181 +urxvt.color14: #93d8d8 -urxvt.color7: #999999 +urxvt.color7: #222224 urxvt.color15: #a9a9a9 Xft.antialias: true |