diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-30 18:03:41 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-30 18:03:41 -0300 |
| commit | 21270afab1850abfa0e2c97250a3fe2daf47adc0 (patch) | |
| tree | 4dc37f70e26e2be04c2d83a41c849a5499b8da96 /libre/icecat/scroogle-ssl-english.xml | |
| parent | 2eb46b7e94aca9e6cd1e4ec53ff5d11a8b831c22 (diff) | |
| parent | 4718f406cb2caa0278ac4bf11a29775f5a1eb0ed (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
libre/aif-libre/PKGBUILD
Diffstat (limited to 'libre/icecat/scroogle-ssl-english.xml')
0 files changed, 0 insertions, 0 deletions