From a481eb656812ba084065a24cafbdea85b94a5a66 Mon Sep 17 00:00:00 2001
From: Tom Willemsen <tom@ryuslash.org>
Date: Sat, 3 Dec 2011 16:22:46 +0100
Subject: [PATCH] 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.
---
 .Xdefaults | 18 ++++++++++--------
 .gitconfig |  4 +++-
 ChangeLog  |  6 ++++++
 3 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 ChangeLog

diff --git a/.Xdefaults b/.Xdefaults
index b0e0b79..9f087cb 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -9,23 +9,25 @@
 *.color1: #800000
 *.color9: #c89490
 ! green
-*.color2:  #5a8e3a
-*.color10: #80b080
+*.color2:  #337733
+*.color10: #5ec95e
 ! yellow
-*.color3:  #c9c990
+*.color3:  #eac435
 *.color11: #ffff77
 ! blue
-*.color4:  RoyalBlue
-*.color12: #90a4c8
+*.color4:  #295874
+*.color12: RoyalBlue
 ! purple
 *.color5:  #585ca8
-*.color13: #ad68a6
+*.color13: #9b859d
 ! cyan
 *.color6:  #287373
 *.color14: #53a5a5
 ! white
-*.color7:  #ececec
-*.color15: #ffffff
+*.color7:  #808080
+! #ececec
+*.color15: #ececec
+! #ffffff
 
 ! General
 urxvt*loginShell:      true
diff --git a/.gitconfig b/.gitconfig
index dfb30c9..04e9618 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Tom Willemsen
-	email = ryuslash@gmail.com
+	email = tom@ryuslash.org
 [core]
 	editor = emacs -nw
 [color]
@@ -15,3 +15,5 @@
 	smtpserver = smtp.gmail.com
 	smtpuser = ryuslash@gmail.com
 	smtpserverport = 587
+[merge]
+	tool = emerge
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..aed05e4
--- /dev/null
+++ b/ChangeLog
@@ -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