diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-22 11:12:08 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-22 11:12:08 -0300 |
commit | d7695add933fbf29023c28037423606b722d30c9 (patch) | |
tree | fdf7ea74db0143fd047025b285e127cb62626ab8 /libre | |
parent | e94fd638ac0deb5b18432dd1d04a053646d7918d (diff) | |
parent | 17dec629d8a13d1981d734ddc703efb5382ca309 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
kde-unstable/soprano/PKGBUILD
testing/imagemagick/PKGBUILD
Diffstat (limited to 'libre')
0 files changed, 0 insertions, 0 deletions