diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-07 17:00:41 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-07 17:00:41 -0300 |
| commit | 3734b1ff855a5738195c6ff3def244d7b2e23e50 (patch) | |
| tree | a4afb881617539f17c75b0ddc58902569d847809 /extra/mash | |
| parent | d4eb5f4f523f90878c8d5ab59e6012ca401ca355 (diff) | |
| parent | 7de07e40e2c0c078a35c5092e1f2defb65d1741e (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/znc/PKGBUILD
extra/hugin/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/postgresql/PKGBUILD
extra/talloc/PKGBUILD
Diffstat (limited to 'extra/mash')
0 files changed, 0 insertions, 0 deletions