diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-02-08 14:28:18 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-02-08 14:28:18 -0500 |
| commit | 6014a41760a107d817422aa5412ccf0ce3fc6e92 (patch) | |
| tree | bd5667a69038f94386878c143f643fa347b3344b /.gitignore | |
| parent | 31f0c8c1ad8c9acf369ab8336765f4bf673b8e21 (diff) | |
| parent | 687f6e6e4e1b49f32cfe19dc4c241a7cdbc97a0a (diff) | |
Merge branch 'backport' into work
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -22,6 +22,7 @@ doc/openbox-gnome-session.1 doc/openbox-kde-session.1 doc/openbox-session.1 doc/openbox.1 +doc/obxprop.1 libtool ltmain.sh m4/*.m4 |