diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-01-08 10:22:30 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-01-08 10:22:30 -0500 |
| commit | 73575c10ce3ede1637e4f959b56e1f7d5f110b91 (patch) | |
| tree | 9af1e7061d53dcc62be4000fc206cfcaa71cc4a8 /debian | |
| parent | 4f414ed0f124fa67b61d347899aa3b30aa0294f1 (diff) | |
| parent | f163c46eaf01ced8405fa36a3bf4a5c488f0f5aa (diff) | |
Merge branch 'backport' into work
Conflicts:
Makefile.am
openbox/actions/focus.c
openbox/config.c
openbox/event.c
openbox/menuframe.c
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 0a15a771..61f72ccf 100644 --- a/debian/control +++ b/debian/control @@ -13,4 +13,4 @@ Suggests: menu, x-display-manager, ksmserver | gnome-session, kdm | gdm Conflicts: menu (<< 2.1.12) Provides: x-window-manager Description: A minimalistic, highly configurable, next generation window manager with extensive standards support. - http://icculus.org/openbox/ + http://openbox.org/ |