summaryrefslogtreecommitdiff
path: root/render/image.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2008-02-27 21:07:10 -0500
committerDana Jansens <danakj@orodu.net>2008-02-27 21:07:10 -0500
commit8bd02bf4b883fa369dd68df2053974407024ddaf (patch)
tree7c765a1d4faa2812fe1993f5ec3ca45ee21ea005 /render/image.c
parent26cc41f6c6187dabd5c7ee4365c8fa44751009e5 (diff)
parentfbacc56d9d0792631b5160df1244ee10214db37d (diff)
Merge branch 'backport' into work
Conflicts: openbox/actions/execute.c
Diffstat (limited to 'render/image.c')
0 files changed, 0 insertions, 0 deletions