diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-29 11:24:07 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-29 11:24:07 -0300 |
| commit | 38bae167f23bd509b81394975c012b8abb1693d7 (patch) | |
| tree | 3b926bce43f03c0366d78ad6253cbdf9520235d4 /community/nginx | |
| parent | 2bcb8acb8b02bde03c5d285baafe754760788265 (diff) | |
| parent | 498a4346616c33beac56d48a246cf27fe3812341 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/espeak/PKGBUILD
community/gmic/PKGBUILD
extra/dhcp/PKGBUILD
extra/hspell/PKGBUILD
extra/libatasmart/PKGBUILD
extra/udisks/PKGBUILD
extra/xorg-server/PKGBUILD
testing/libdrm/PKGBUILD
testing/libdrm/no-pthread-stubs.patch
testing/systemd/PKGBUILD
Diffstat (limited to 'community/nginx')
0 files changed, 0 insertions, 0 deletions