diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-01 15:13:07 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-01 15:13:07 -0300 |
| commit | 11dd742b39ac10b320183f78d2cf81e4680f9a4e (patch) | |
| tree | d6150b2fd3f3127e1aa88e173e17a4f1ad205f75 /extra/ossp | |
| parent | 1365d8aac05d2f167d0a1678cc291bbec3efff5c (diff) | |
| parent | c40a217db5f63be3aa88a32ad77ec93efb40d95c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/mhwaveedit/PKGBUILD
extra/apr/PKGBUILD
extra/xorg-server/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/unarchiver/PKGBUILD
Diffstat (limited to 'extra/ossp')
0 files changed, 0 insertions, 0 deletions