diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-11-26 11:56:56 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-11-26 11:56:56 +0100 |
| commit | 0fc7a60c47b41bf54d1f1429fddb6baddb80007c (patch) | |
| tree | 77f6cc6477ba82a940d83258ffc98e2f26e40284 /core | |
| parent | 47ed35d319764a0de3a242524e037319bd1a52bd (diff) | |
| parent | 6a642c093f29814cdd0fdefeee3ab9400eae490f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ncdu/PKGBUILD
extra/gcin/PKGBUILD
extra/maxima/PKGBUILD
extra/sbcl/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions