summaryrefslogtreecommitdiff
path: root/config/images.c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-02 13:40:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-02 13:40:13 +0100
commit2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch)
tree780bd8869c0ed798d8c0abce17869a29cc01fb01 /config/images.c
parent2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff)
parent34592482701199604242848b80c39bd07b6c7716 (diff)
resolve merge conflict
Diffstat (limited to 'config/images.c')
0 files changed, 0 insertions, 0 deletions