diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 11:21:01 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 11:21:01 -0300 |
| commit | b337b14a9cce5d126d55695c97698484ac52a8ea (patch) | |
| tree | 8aa6281e14d6bd9b0876ae0e641d76de9e51cce0 /extra/gcalctool/PKGBUILD | |
| parent | 66873986693bc3c8812d12f3919f1977b9a30674 (diff) | |
| parent | 079c689ef9b252fd82dbf9b182ec2517c48f8737 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/conkeror-git/PKGBUILD
community/spidermonkey/PKGBUILD
core/gcc/PKGBUILD
extra/file-roller/PKGBUILD
extra/pixman/PKGBUILD
extra/poppler/PKGBUILD
extra/qtiplot/PKGBUILD
extra/xulrunner/PKGBUILD
extra/xulrunner/xulrunner-omnijar.patch
kde-unstable/akonadi/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/gcc-multilib/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/gcalctool/PKGBUILD')
0 files changed, 0 insertions, 0 deletions