diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-30 12:20:28 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-30 12:20:28 -0300 |
| commit | cbd27aa2c3c49e4d93979e847d8b177a1a4fe324 (patch) | |
| tree | 2518fdda7fa59c59e691c6de52f830d58545aed4 /extra/sip | |
| parent | c6ead99bc92bd2b6da3e78e9cba5a8a86764de10 (diff) | |
| parent | 946f0c9fe48dfb648a8a0be065e92f237ce210fd (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/flashrom/PKGBUILD
extra/chmlib/PKGBUILD
extra/crypto++/PKGBUILD
extra/dvgrab/PKGBUILD
extra/ebook-tools/PKGBUILD
extra/fping/PKGBUILD
extra/garcon/PKGBUILD
extra/gpart/PKGBUILD
extra/gtk2-perl/PKGBUILD
extra/hd2u/PKGBUILD
extra/hexedit/PKGBUILD
Diffstat (limited to 'extra/sip')
0 files changed, 0 insertions, 0 deletions