diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-06 12:03:23 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-06 12:03:23 -0300 |
| commit | 602bbc9f8ca0debe0fe88aac1ddc969c405f96b0 (patch) | |
| tree | 34c0b1890fadd22588d98422a3cc2c2909094216 /artistic | |
| parent | a356d89e91e7ce1dd622d6dfe1b13412923d3b96 (diff) | |
| parent | 664b1c2195b2884102cc2d5a56a13702f8ee44fe (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/postgresql/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
Diffstat (limited to 'artistic')
0 files changed, 0 insertions, 0 deletions