diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-29 12:36:05 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-29 12:36:05 -0300 |
| commit | 6f36350b7b59dd4ccea3dd878938dd47b77a1608 (patch) | |
| tree | 6e81bc69d8bba80912b0f7f9224f82bda2d96792 /elementary | |
| parent | e40531aab32ff93b1f9da20d8a43a440d8dffaca (diff) | |
| parent | 83c3c42a38bda36bdc56d594318958bc4cfd9b32 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/percona-server/PKGBUILD
community/qdevelop/PKGBUILD
core/openssh/PKGBUILD
extra/colord/PKGBUILD
extra/enblend-enfuse/PKGBUILD
extra/mesa/PKGBUILD
extra/telepathy-kde-contact-list/PKGBUILD
extra/vim/PKGBUILD
multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'elementary')
0 files changed, 0 insertions, 0 deletions