diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-12 11:23:20 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-12 11:23:20 +0200 |
| commit | ea84a7ef4c3c637a7504361c6ac42e8ba93a6179 (patch) | |
| tree | 0bee5e198a06cfeff7de0396c4739ae2569f7067 /java-ugly | |
| parent | e55fda657497bd8743c0a57d917316afe70950f8 (diff) | |
| parent | 5b9e0d821dd428792bd51ed03af2b800924ce69d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/start-stop-daemon/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/giflib/PKGBUILD
extra/gvfs/PKGBUILD
extra/latex2rtf/PKGBUILD
extra/libgpod/PKGBUILD
extra/libimobiledevice/PKGBUILD
extra/libvpx/PKGBUILD
extra/libwpg/PKGBUILD
extra/libxml2/PKGBUILD
extra/pixman/PKGBUILD
extra/thunar-archive-plugin/PKGBUILD
Diffstat (limited to 'java-ugly')
0 files changed, 0 insertions, 0 deletions