summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2010-02-08 14:28:18 -0500
committerDana Jansens <danakj@orodu.net>2010-02-08 14:28:18 -0500
commit6014a41760a107d817422aa5412ccf0ce3fc6e92 (patch)
treebd5667a69038f94386878c143f643fa347b3344b /Makefile.am
parent31f0c8c1ad8c9acf369ab8336765f4bf673b8e21 (diff)
parent687f6e6e4e1b49f32cfe19dc4c241a7cdbc97a0a (diff)
Merge branch 'backport' into work
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 91b23033..c60389af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -542,7 +542,8 @@ nodist_man_MANS = \
doc/openbox.1 \
doc/openbox-session.1 \
doc/openbox-gnome-session.1 \
- doc/openbox-kde-session.1
+ doc/openbox-kde-session.1 \
+ doc/obxprop.1
EXTRA_DIST = \
config.rpath