diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-06 18:47:18 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-06 18:47:18 +0100 |
| commit | 0ecad2876ee230c3929d93e97a5ff9aabb34639e (patch) | |
| tree | 9858158941e1c5616209051070e0a4b999900bfb /extra/libzip | |
| parent | a6e4eeba56ffd555f912ac1063ed08245e3f43c1 (diff) | |
| parent | 55d1e19e71b453a0f47c599f281a2ad2644247d2 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/jack2/PKGBUILD
community/tremulous/PKGBUILD
extra/audiofile/PKGBUILD
extra/graphviz/PKGBUILD
extra/jhead/PKGBUILD
extra/redland/PKGBUILD
multilib/nspluginwrapper/PKGBUILD
Diffstat (limited to 'extra/libzip')
0 files changed, 0 insertions, 0 deletions