]> icculus.org git repositories - dana/openbox.git/commit - parser/parse.c
projects / dana / openbox.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bbf0eed f1f61ff)
Merge branch 'backport' into work
authorMikael Magnusson <mikachu@comhem.se>
Thu, 14 Feb 2008 09:51:35 +0000 (10:51 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Thu, 14 Feb 2008 18:43:02 +0000 (19:43 +0100)
commit1124d1036984f920dcd5b2caec9ff8fe2d788b8a
tree6e0c626f33ee58e5888ceb4a11608f2103a34d16tree
parentbbf0eed8d146602e81e64e9bc6d1c451c260b52fcommit | diff
parentf1f61ff703db72cc1db7f834c9cb45616d55da10commit | diff
Merge branch 'backport' into work

Diffing against the old work branch where most of the changes
in backport were cherry-picked from indicates this should be
alright. (0de9097017d4d1991388a35e380a57dc1135b431)
12 files changed:
data/rc.xml diff1 | diff2 | blob | history
m4/openbox.m4 diff1 | diff2 | blob | history
openbox/actions.c diff1 | diff2 | blob | history
openbox/client.c diff1 | diff2 | blob | history
openbox/config.c diff1 | diff2 | blob | history
openbox/config.h diff1 | diff2 | blob | history
openbox/event.c diff1 | diff2 | blob | history
openbox/menuframe.c diff1 | diff2 | blob | history
openbox/mouse.c diff1 | diff2 | blob | history
render/font.c diff1 | diff2 | blob | history
render/theme.c diff1 | diff2 | blob | history
render/theme.h diff1 | diff2 | blob | history
Openbox Window Manager