diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-03-03 12:57:59 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-03-03 12:57:59 -0300 |
commit | dc2ea8467c1f4bdac0c8409ffb5872dc51185a80 (patch) | |
tree | 1b9201a8dfa6b90cfc2e4ea993ad30563a40edcf /patches/logo_linux_vga16.ppm | |
parent | 45c6bdd08103761adb6222e7c9af9dffbfa1bc7f (diff) | |
parent | 9ec4865ad0c8bbf85336ede03594ee8cefde3252 (diff) |
Merge branch 'master' of https://projects.archlinux.org/git/linux-2.6-ARCH
Conflicts:
PATCHCFG
Diffstat (limited to 'patches/logo_linux_vga16.ppm')
0 files changed, 0 insertions, 0 deletions