merge r6415-6416 from trunk
authorDana Jansens <danakj@orodu.net>
Sun, 13 May 2007 00:21:01 +0000 (00:21 +0000)
committerDana Jansens <danakj@orodu.net>
Sun, 13 May 2007 00:21:01 +0000 (00:21 +0000)
debian/conffiles [new file with mode: 0644]

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