diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-01-11 16:20:53 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-01-11 16:20:53 -0500 |
| commit | 567fd15eebdd44e50cef140419dbf7a336708109 (patch) | |
| tree | 3b3691719c704d6da4454bd78e17ec8b495ee76a /data/xsession | |
| parent | 3e9dbc01430193035e3d1f5832c019c3f9623db8 (diff) | |
| parent | e8200ae603f33b70824c125ba6b37bfaec7d89ea (diff) | |
Merge branch 'backport' into work
Conflicts:
configure.ac
data/rc.xml
openbox/client.c
openbox/event.c
openbox/focus_cycle.c
openbox/focus_cycle_popup.c
openbox/openbox.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
parser/parse.c
version.h.in
Diffstat (limited to 'data/xsession')
0 files changed, 0 insertions, 0 deletions