]> icculus.org git repositories - dana/openbox.git/commit - render/theme.c
projects / dana / openbox.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e9dbc0 e8200ae)
Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 21:20:53 +0000 (16:20 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 21:20:53 +0000 (16:20 -0500)
commit567fd15eebdd44e50cef140419dbf7a336708109
tree3b3691719c704d6da4454bd78e17ec8b495ee76atree
parent3e9dbc01430193035e3d1f5832c019c3f9623db8commit | diff
parente8200ae603f33b70824c125ba6b37bfaec7d89eacommit | 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
18 files changed:
configure.ac diff1 | diff2 | blob | history
data/rc.xml diff1 | diff2 | blob | history
obt/prop.c diff1 | | blob | history
obt/prop.h diff1 | | blob | history
openbox/client.c diff1 | diff2 | blob | history
openbox/client.h diff1 | diff2 | blob | history
openbox/event.c diff1 | diff2 | blob | history
openbox/focus.c diff1 | diff2 | blob | history
openbox/focus.h diff1 | diff2 | blob | history
openbox/focus_cycle.c diff1 | diff2 | blob | history
openbox/focus_cycle.h diff1 | diff2 | blob | history
openbox/focus_cycle_popup.c diff1 | diff2 | blob | history
openbox/focus_cycle_popup.h diff1 | diff2 | blob | history
openbox/menuframe.c diff1 | diff2 | blob | history
openbox/menuframe.h diff1 | diff2 | blob | history
openbox/openbox.c diff1 | diff2 | blob | history
openbox/screen.c diff1 | diff2 | blob | history
version.h.in | diff2 | blob | history
Openbox Window Manager