diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-02 11:49:30 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-02 11:49:30 +0100 |
| commit | 8c2be15938e3ec559429e4137420ac246c9f7641 (patch) | |
| tree | 985da2395afe5f2fbafa6e8c1cfc4296a6cb4f58 /libre/kernel26-libre-manpages | |
| parent | 9d0a374dab604311fd494d33b285d61d61d1d906 (diff) | |
| parent | ac5ada660240f37d7347e42123071990f616e418 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mtpaint/PKGBUILD
community-testing/mtpaint/PKGBUILD
community-testing/rawtherapee/PKGBUILD
community/gedit-plugins/PKGBUILD
core/iptables/PKGBUILD
core/sudo/PKGBUILD
extra/xfce4-xkb-plugin/PKGBUILD
multilib/lib32-zlib/PKGBUILD
staging/mtpaint/PKGBUILD
testing/kmod/PKGBUILD
testing/openjdk6/PKGBUILD
testing/run-parts/PKGBUILD
testing/xulrunner/PKGBUILD
Diffstat (limited to 'libre/kernel26-libre-manpages')
0 files changed, 0 insertions, 0 deletions