diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-06-23 01:58:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-06-23 01:58:32 -0300 |
| commit | 3fabd61dd8b4ce0e9d89e668755b4c7b05ab4211 (patch) | |
| tree | fc9446f3c2b29e69d7ad85bea0bd0a5d09000cc7 /patches/logo_linux_vga16.ppm | |
| parent | 8fe1b7a317e24c53d14e7973a42df19529508d7a (diff) | |
| parent | ce5748cfbb0123d405206c033d3db246ad80d04e (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