GIT & XDEFAULTS: email adress, merge tool, colors
Git: email address has been changed and the merge tool has been set to emerge (as trial). Xdefaults: Changed the colors.
This commit is contained in:
parent
61c152d2f6
commit
a481eb6568
3 changed files with 19 additions and 9 deletions
18
.Xdefaults
18
.Xdefaults
|
@ -9,23 +9,25 @@
|
||||||
*.color1: #800000
|
*.color1: #800000
|
||||||
*.color9: #c89490
|
*.color9: #c89490
|
||||||
! green
|
! green
|
||||||
*.color2: #5a8e3a
|
*.color2: #337733
|
||||||
*.color10: #80b080
|
*.color10: #5ec95e
|
||||||
! yellow
|
! yellow
|
||||||
*.color3: #c9c990
|
*.color3: #eac435
|
||||||
*.color11: #ffff77
|
*.color11: #ffff77
|
||||||
! blue
|
! blue
|
||||||
*.color4: RoyalBlue
|
*.color4: #295874
|
||||||
*.color12: #90a4c8
|
*.color12: RoyalBlue
|
||||||
! purple
|
! purple
|
||||||
*.color5: #585ca8
|
*.color5: #585ca8
|
||||||
*.color13: #ad68a6
|
*.color13: #9b859d
|
||||||
! cyan
|
! cyan
|
||||||
*.color6: #287373
|
*.color6: #287373
|
||||||
*.color14: #53a5a5
|
*.color14: #53a5a5
|
||||||
! white
|
! white
|
||||||
*.color7: #ececec
|
*.color7: #808080
|
||||||
*.color15: #ffffff
|
! #ececec
|
||||||
|
*.color15: #ececec
|
||||||
|
! #ffffff
|
||||||
|
|
||||||
! General
|
! General
|
||||||
urxvt*loginShell: true
|
urxvt*loginShell: true
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[user]
|
[user]
|
||||||
name = Tom Willemsen
|
name = Tom Willemsen
|
||||||
email = ryuslash@gmail.com
|
email = tom@ryuslash.org
|
||||||
[core]
|
[core]
|
||||||
editor = emacs -nw
|
editor = emacs -nw
|
||||||
[color]
|
[color]
|
||||||
|
@ -15,3 +15,5 @@
|
||||||
smtpserver = smtp.gmail.com
|
smtpserver = smtp.gmail.com
|
||||||
smtpuser = ryuslash@gmail.com
|
smtpuser = ryuslash@gmail.com
|
||||||
smtpserverport = 587
|
smtpserverport = 587
|
||||||
|
[merge]
|
||||||
|
tool = emerge
|
||||||
|
|
6
ChangeLog
Normal file
6
ChangeLog
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
2011-12-03 Tom Willemsen <tom@ryuslash.org>
|
||||||
|
|
||||||
|
* .Xdefaults: Changed `*.color2' from #5a8e3a to #337733,
|
||||||
|
`*.color10' from #80b080 to #5ec95e, `*.color3' from #c9c990 to
|
||||||
|
#eac435, `*.color4' from RoyalBlue to #295874, `*.color12' from
|
||||||
|
#90a4c8 to RoyalBlue and `*.color13' from #ad68a6 to #9b859d
|
Loading…
Reference in a new issue