diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-03 10:15:48 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-03 10:15:48 +0200 |
| commit | f3a4e8da400567018b5d73b66cd67b8da0d280b8 (patch) | |
| tree | d5155fde8d7050660d85895ac9cb185c580c9f7e /community/gmerlin | |
| parent | 20bbe9abadb460e01df2d5eefabdd199033274a5 (diff) | |
| parent | 32b069e79cb891e99962cbac53e2950c11ea403f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/python-simplejson/PKGBUILD
community/teeworlds/PKGBUILD
core/openldap/PKGBUILD
core/zlib/PKGBUILD
extra/soprano/PKGBUILD
extra/ucommon/PKGBUILD
Diffstat (limited to 'community/gmerlin')
0 files changed, 0 insertions, 0 deletions