diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-21 20:42:53 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-21 20:42:53 -0300 |
| commit | 64a660adb9a1ad658874759c186e0e9cbf138e63 (patch) | |
| tree | 310ed3d87e92f803f9951e7bc402bf616339e3ff /archiso | |
| parent | be5fc1d5c788df0f2d8d050e97581977caf133a3 (diff) | |
| parent | aca6dbaec9cc8af34ffad79b48054ac6b405174c (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/archiso
Conflicts:
configs/releng/packages.i686
configs/releng/packages.x86_64
Diffstat (limited to 'archiso')
0 files changed, 0 insertions, 0 deletions