diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
| commit | acafa38c8ea210b12ed92fc16281b915ab61542c (patch) | |
| tree | ce4c7d2a4a9b3478a4d48af2c54ada06593ed022 /po | |
| parent | 2f09e0ce388f63c341cb328d795766e2bd0dc24b (diff) | |
| parent | 9ba2b04e96449fea5b6bd212aa3d431638754bdd (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/config.c
openbox/event.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
openbox/screen.h
Diffstat (limited to 'po')
| -rw-r--r-- | po/POTFILES.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 9bd4f66a..200e9ca3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,7 +2,6 @@ openbox/actions.c openbox/actions/execute.c openbox/actions/exit.c -openbox/actions/session.c openbox/client.c openbox/client_list_combined_menu.c openbox/client_list_menu.c |