diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-28 12:00:40 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-28 12:00:40 -0300 |
| commit | 8539eba5172b223acd7238f637ca2a6d7e85490f (patch) | |
| tree | 0b6504cbf480ff6c53ac48e5ef7a49a024c9bd58 /extra/json-c | |
| parent | ac84c0a6f7b12fcf77af9b7ed5c71a3949a35ec3 (diff) | |
| parent | b3288f94e625603d6b5b23740b721287e75eead7 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/attica/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdebindings-perlqt/PKGBUILD
kde-unstable/kdebindings-smokekde/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
Diffstat (limited to 'extra/json-c')
0 files changed, 0 insertions, 0 deletions