From: Dana Jansens <danakj@orodu.net>
Date: Sun, 13 May 2007 00:21:01 +0000 (+0000)
Subject: merge r6415-6416 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~62
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=63b8dcf27f07b629f6945e7860d6f42e0d6e714f;p=dana%2Fopenbox.git

merge r6415-6416 from trunk
---

diff --git a/debian/conffiles b/debian/conffiles
new file mode 100644
index 00000000..6319a21a
--- /dev/null
+++ b/debian/conffiles
@@ -0,0 +1,2 @@
+/etc/xdg/openbox/rc.xml
+/etc/xdg/openbox/menu.xml