1 commit

Author	SHA1	Message	Date
Tom Willemsen	a481eb6568	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.	2011-12-03 16:27:53 +01:00