From a481eb656812ba084065a24cafbdea85b94a5a66 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 3 Dec 2011 16:22:46 +0100
Subject: 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.
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 ChangeLog

(limited to 'ChangeLog')

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
-- 
cgit v1.2.3-54-g00ecf