# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1402801616 14400
# Node ID e341df2dafdab71578c74525cdcb3501844e619f
# Parent  fe505cd6be19e22d3ffac1bc99d6eb070ec9814d
Allow .Xdefaults.local to be included, don\'t rely on system to run xrdb -cpp

diff --git a/.Xdefaults b/.Xdefaults
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -15,3 +15,4 @@ URxvt.saveLines: 1000
 URxvt.iso14755: false
 URxvt.iso14755_52: false
 
+#include ".Xdefaults.local"
diff --git a/.xsessionrc b/.xsessionrc
--- a/.xsessionrc
+++ b/.xsessionrc
@@ -24,6 +24,10 @@ if [ -x /usr/bin/xcompmgr ]; then
 fi
 
 
+if [ -r ~/.Xdefaults.local ]; then
+  /usr/bin/xrdb -quiet -merge -cpp /usr/bin/cpp ~/.Xdefaults.local
+fi
+
 if [ -r ~/.xsessionrc.local ]; then
   . ~/.xsessionrc.local
 fi