diff options
| author | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
| commit | 8647aee53c2f9f5458e57fe7ac212da40a555594 (patch) | |
| tree | b99a8fbc859d18a244ea5ac496083e66ffaa330d /~lukeshu/svn-graph-branches | |
| parent | 3a14409a347f3423bf2a4ab847edff625b671e20 (diff) | |
| parent | 0a5c7083d197551290bc762f4ba90210cb733a5e (diff) | |
| download | abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.gz abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.bz2 abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.zip | |
Merge branch 'master' of vparabola:abslibre
Conflicts:
java/not-working/java-bnd/PKGBUILD
libre/parabola-keyring/PKGBUILD
Diffstat (limited to '~lukeshu/svn-graph-branches')
0 files changed, 0 insertions, 0 deletions