diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-24 10:07:23 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-24 10:07:23 +0100 |
| commit | 7de52b3e0af5b0e3937ecee5db3f2d046c8f6cc8 (patch) | |
| tree | 7b4a19f9b0d57d70a7c2903d74b4985d5a48e02b /java-ugly | |
| parent | cd43f33594087073804af089c7860ec4001d84dc (diff) | |
| parent | 90f97c6f30af5c30599fab0b6d6c1f474ad15fe0 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/xorg-server/PKGBUILD
libre/cdrkit-libre/PKGBUILD
Diffstat (limited to 'java-ugly')
0 files changed, 0 insertions, 0 deletions