summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-12-10 07:29:00 +0000
committerThierry Vignaud <tv@mageia.org>2011-12-10 07:29:00 +0000
commit3bda2867c6f1c11c43391f159940910b74df01ce (patch)
tree185aabc1910de6747fe41106e80bd41cf309048b /images
parent0de5aae61abf5419f17de95a9a36fc5c86940805 (diff)
downloaddrakx-3bda2867c6f1c11c43391f159940910b74df01ce.tar
drakx-3bda2867c6f1c11c43391f159940910b74df01ce.tar.gz
drakx-3bda2867c6f1c11c43391f159940910b74df01ce.tar.bz2
drakx-3bda2867c6f1c11c43391f159940910b74df01ce.tar.xz
drakx-3bda2867c6f1c11c43391f159940910b74df01ce.zip
fix mismerge
Diffstat (limited to 'images')
0 files changed, 0 insertions, 0 deletions