diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-15 11:06:04 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-15 11:06:04 +0100 |
| commit | 5db9045af8870daff1761cbdc00a1b392ec04e0d (patch) | |
| tree | b166e9bbd13269d614d2afcad6c7c817771d70e3 /extra/openjdk6/glibc2_15.diff | |
| parent | b71d5073741581206df880b70696680e743abbeb (diff) | |
| parent | 812b715ebd89fb9049df7000c721990084b525c6 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/pari/PKGBUILD
extra/xfce4-mpc-plugin/PKGBUILD
extra/xfce4-session/PKGBUILD
testing/kmod/PKGBUILD
testing/xf86-video-sis/PKGBUILD
Diffstat (limited to 'extra/openjdk6/glibc2_15.diff')
0 files changed, 0 insertions, 0 deletions