projects / dana / openbox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5f9bfb1)
merge r6415-6416 from trunk
authorDana Jansens <danakj@orodu.net>
Sun, 13 May 2007 00:20:46 +0000 (00:20 +0000)
committerDana Jansens <danakj@orodu.net>
Sun, 13 May 2007 00:20:46 +0000 (00:20 +0000)
Makefile.am patch | blob | history

diff --git a/Makefile.am b/Makefile.am
index 6e4e87de1ef82159840696a54e8ce3e14dea61c4..373f78b394cf7b2b8af857d23d8490befe79432a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -375,6 +375,7 @@ dist_xsessions_DATA = \
 dist_noinst_DATA = \
        debian/changelog.in \
        debian/compat \
+       debian/conffiles \
        debian/control \
        debian/copyright \
        debian/menu \
Openbox Window Manager