diff options
author | Thierry Vignaud <tv@mageia.org> | 2011-12-10 07:29:00 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2011-12-10 07:29:00 +0000 |
commit | 7c332b5cc72661f533542561478ba8b00e792224 (patch) | |
tree | 185aabc1910de6747fe41106e80bd41cf309048b /perl-install/pixmaps | |
parent | 0046d5349628371e7c33674ada98a652fbb8a683 (diff) | |
download | drakx-backup-do-not-use-7c332b5cc72661f533542561478ba8b00e792224.tar drakx-backup-do-not-use-7c332b5cc72661f533542561478ba8b00e792224.tar.gz drakx-backup-do-not-use-7c332b5cc72661f533542561478ba8b00e792224.tar.bz2 drakx-backup-do-not-use-7c332b5cc72661f533542561478ba8b00e792224.tar.xz drakx-backup-do-not-use-7c332b5cc72661f533542561478ba8b00e792224.zip |
fix mismerge
Diffstat (limited to 'perl-install/pixmaps')
0 files changed, 0 insertions, 0 deletions